[PATCH] Fix UI tests with dist-vendored dependencies
authorJosh Stone <jistone@redhat.com>
Mon, 8 Apr 2024 22:04:44 +0000 (15:04 -0700)
committerFabian Grünbichler <debian@fabian.gruenbichler.email>
Mon, 24 Jun 2024 06:25:58 +0000 (08:25 +0200)
commitb3bf75fbad4a93f033313c3414fd039eb8511a7d
tree0d0736ac8f98def7cbb2cb83e12fab63bec90d5d
parent8988c9ebd6279af53d1e01e8b4a297fed9323961
[PATCH] Fix UI tests with dist-vendored dependencies

There is already a workaround in `compiletest` to deal with custom
`CARGO_HOME` using `-Zignore-directory-in-diagnostics-source-blocks={}`.
A similar need exists when dependencies come from the local `vendor`
directory, which distro builds often use, so now we ignore that too.

Also, `issue-21763.rs` was normalizing `hashbrown-` paths, presumably
expecting a version suffix, but the vendored path doesn't include the
version. Now that matches `[\\/]hashbrown` instead.

Forwarded: yes

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
src/tools/compiletest/src/runtest.rs
tests/ui/issues/issue-21763.rs