test: omit target-dir name #14142

weihanglo · 2024-06-25T16:21:46Z

This was found during submodule update in rust-lang/rust repo.

---- publish_lockfile::note_resolve_changes stdout ----
thread 'publish_lockfile::note_resolve_changes' panicked at tests/testsuite/publish_lockfile.rs:255:10:

error: Expected lines did not match (ignoring order):
0   6        Packaging foo v0.0.1 ([..])
1   0        Archiving Cargo.lock
2   0        Archiving Cargo.toml
3   1        Archiving Cargo.toml.orig
4   0        Archiving src/main.rs
5   0         Updating `dummy-registry` index
6   2     note: package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
7   2     note: package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
8   0         Packaged 4 files, 2.1KiB (1.1KiB compressed)
9        -warning: no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]`
    9    +warning: no (git) Cargo.toml found at `build/aarch64-apple-darwin/stage2-tools/aarch64-apple-darwin/tmp/cit/t0/foo/Cargo.toml` in workdir `[..]`

This was found during submodule update in rust-lang/rust repo. ``` error: Expected lines did not match (ignoring order): 0 6 Packaging foo v0.0.1 ([..]) 1 0 Archiving Cargo.lock 2 0 Archiving Cargo.toml 3 1 Archiving Cargo.toml.orig 4 0 Archiving src/main.rs 5 0 Updating `dummy-registry` index 6 2 note: package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]` 7 2 note: package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]` 8 0 Packaged 4 files, 2.1KiB (1.1KiB compressed) 9 -warning: no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]` 9 +warning: no (git) Cargo.toml found at `build/aarch64-apple-darwin/stage2-tools/aarch64-apple-darwin/tmp/cit/t0/foo/Cargo.toml` in workdir `[..]` ```

rustbot · 2024-06-25T16:21:52Z

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

epage · 2024-06-25T16:24:15Z

tests/testsuite/publish_lockfile.rs

@@ -249,7 +249,7 @@ fn note_resolve_changes() {
 [NOTE] package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]/foo/multi`
 [NOTE] package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]/foo/patched`
 [PACKAGED] [..] files, [..] ([..] compressed)
-[WARNING] no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]`


Is this something we're going to regularly run into? Is there an auto-redactuion we can use to help avoid this?

It is a bit special because it points to the path of our test infra, not the test case environment. I don't think it is a common thing.

epage · 2024-06-25T16:24:37Z

While I hope there is a better way, merging to unblock submodule update

@bors r+

bors · 2024-06-25T16:24:39Z

📌 Commit 47ddb3a has been approved by epage

It is now in the queue for this repository.

bors · 2024-06-25T16:28:24Z

⌛ Testing commit 47ddb3a with merge 4ed7bee...

bors · 2024-06-25T17:02:30Z

☀️ Test successful - checks-actions
Approved by: epage
Pushing 4ed7bee to master...

Update cargo 10 commits in bc89bffa5987d4af8f71011c7557119b39e44a65..4ed7bee47f7dd4416b36fada1909e9a62c546246 2024-06-22 00:36:36 +0000 to 2024-06-25 16:28:22 +0000 - test: omit target-dir name (rust-lang/cargo#14142) - test: migrate offline, open_namespaces and owner to snapbox (rust-lang/cargo#14138) - docs: remove stray comment (rust-lang/cargo#14133) - Change tests to support `rustc` wording changes (rust-lang/cargo#14135) - deps: dont use tracing-attributes for workspace, use for cargo only (rust-lang/cargo#14122) - Include vcs_info even if workspace is dirty (rust-lang/cargo#13960) - test: migrate profile* to snapbox (rust-lang/cargo#14128) - test: migrate path and paths to snapbox (rust-lang/cargo#14109) - test: migrate rustflags, rustup and script to snapbox (rust-lang/cargo#14126) - test: migrate rename_deps, replace, required_features and run to snapbox (rust-lang/cargo#14127)

rustbot assigned epage Jun 25, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 25, 2024

epage reviewed Jun 25, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 25, 2024

bors merged commit 4ed7bee into rust-lang:master Jun 25, 2024
22 checks passed

weihanglo mentioned this pull request Jun 25, 2024

Update cargo rust-lang/rust#126955

Merged

rustbot added this to the 1.81.0 milestone Jun 26, 2024

weihanglo deleted the fix-test branch July 9, 2024 20:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: omit target-dir name #14142

test: omit target-dir name #14142

test: omit target-dir name #14142

test: omit target-dir name #14142

Conversation

Choose a reason for hiding this comment

Choose a reason for hiding this comment