Filter out some flaky output from cargo tests

oli-obk · oli-obk · commit 33d00c7c3385 · 2023-03-01T08:03:19.000Z
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ tempfile = { version = "3.2", optional = true }
 termize = "0.1"
 
 [dev-dependencies]
-ui_test = { git = "https://github.com/oli-obk/ui_test.git", branch = "aux_build" }
+ui_test = { path = "../ui_test" }
 tester = "0.9"
 regex = "1.5"
 toml = "0.5"
diff --git a/tests/ui-cargo/cargo_common_metadata/fail/Cargo.stderr b/tests/ui-cargo/cargo_common_metadata/fail/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking cargo_common_metadata_fail v0.1.0 ($DIR/$DIR)
 warning: package `cargo_common_metadata_fail` is missing `package.description` metadata
   |
 note: the lint level is defined here
diff --git a/tests/ui-cargo/cargo_common_metadata/fail_publish/Cargo.stderr b/tests/ui-cargo/cargo_common_metadata/fail_publish/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking cargo_common_metadata_fail_publish v0.1.0 ($DIR/$DIR)
 warning: package `cargo_common_metadata_fail_publish` is missing `package.description` metadata
   |
 note: the lint level is defined here
diff --git a/tests/ui-cargo/cargo_common_metadata/fail_publish_true/Cargo.stderr b/tests/ui-cargo/cargo_common_metadata/fail_publish_true/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking cargo_common_metadata_fail_publish_true v0.1.0 ($DIR/$DIR)
 warning: package `cargo_common_metadata_fail_publish_true` is missing `package.description` metadata
   |
 note: the lint level is defined here
diff --git a/tests/ui-cargo/cargo_common_metadata/pass/Cargo.stderr b/tests/ui-cargo/cargo_common_metadata/pass/Cargo.stderr
@@ -1,2 +1 @@
-    Checking cargo_common_metadata_pass v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_common_metadata/pass_publish_empty/Cargo.stderr b/tests/ui-cargo/cargo_common_metadata/pass_publish_empty/Cargo.stderr
@@ -1,2 +1 @@
-    Checking cargo_common_metadata_pass_publish_empty v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_common_metadata/pass_publish_false/Cargo.stderr b/tests/ui-cargo/cargo_common_metadata/pass_publish_false/Cargo.stderr
@@ -1,2 +1 @@
-    Checking cargo_common_metadata_pass_publish_false v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_rust_version/fail_both_diff/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/fail_both_diff/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-both-diff v0.1.0 ($DIR/$DIR)
 warning: the MSRV in `clippy.toml` and `Cargo.toml` differ; using `1.59.0` from `clippy.toml`
 
 error: unnecessary structure name repetition
diff --git a/tests/ui-cargo/cargo_rust_version/fail_both_same/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/fail_both_same/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-both-same v0.1.0 ($DIR/$DIR)
 error: unnecessary structure name repetition
  --> src/main.rs:6:21
   |
diff --git a/tests/ui-cargo/cargo_rust_version/fail_cargo/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/fail_cargo/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-cargo v0.1.0 ($DIR/$DIR)
 error: unnecessary structure name repetition
  --> src/main.rs:6:21
   |
diff --git a/tests/ui-cargo/cargo_rust_version/fail_clippy/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/fail_clippy/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-clippy v0.1.0 ($DIR/$DIR)
 error: unnecessary structure name repetition
  --> src/main.rs:6:21
   |
diff --git a/tests/ui-cargo/cargo_rust_version/fail_file_attr/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/fail_file_attr/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-file-attr v0.1.0 ($DIR/$DIR)
 error: unnecessary structure name repetition
   --> src/main.rs:11:21
    |
diff --git a/tests/ui-cargo/cargo_rust_version/pass_both_same/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/pass_both_same/Cargo.stderr
@@ -1,2 +1 @@
-    Checking pass-both-same v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_rust_version/pass_cargo/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/pass_cargo/Cargo.stderr
@@ -1,2 +1 @@
-    Checking pass-cargo v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_rust_version/pass_clippy/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/pass_clippy/Cargo.stderr
@@ -1,2 +1 @@
-    Checking pass-clippy v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_rust_version/pass_file_attr/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/pass_file_attr/Cargo.stderr
@@ -1,2 +1 @@
-    Checking pass-file-attr v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/cargo_rust_version/warn_both_diff/Cargo.stderr b/tests/ui-cargo/cargo_rust_version/warn_both_diff/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking warn-both-diff v0.1.0 ($DIR/$DIR)
 warning: the MSRV in `clippy.toml` and `Cargo.toml` differ; using `1.13.0` from `clippy.toml`
 
 warning: `warn-both-diff` (bin "warn-both-diff") generated 1 warning
diff --git a/tests/ui-cargo/duplicate_mod/fail/Cargo.stderr b/tests/ui-cargo/duplicate_mod/fail/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking duplicate_mod v0.1.0 ($DIR/$DIR)
 warning: file is loaded as a module multiple times: `src/b.rs`
  --> src/main.rs:5:1
   |
diff --git a/tests/ui-cargo/feature_name/pass/Cargo.stderr b/tests/ui-cargo/feature_name/pass/Cargo.stderr
@@ -1,2 +1 @@
-    Checking feature_name v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/module_style/fail_mod/Cargo.stderr b/tests/ui-cargo/module_style/fail_mod/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-mod v0.1.0 ($DIR/$DIR)
 warning: `mod.rs` files are required, found `src/bad/inner.rs`
  --> src/bad/inner.rs:1:1
   |
diff --git a/tests/ui-cargo/module_style/fail_mod_remap/Cargo.stderr b/tests/ui-cargo/module_style/fail_mod_remap/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-mod-remap v0.1.0 ($DIR/$DIR)
 warning: `mod.rs` files are required, found `src/bad.rs`
  --> src/bad.rs:1:1
   |
diff --git a/tests/ui-cargo/module_style/fail_no_mod/Cargo.stderr b/tests/ui-cargo/module_style/fail_no_mod/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking fail-no-mod v0.1.0 ($DIR/$DIR)
 warning: `mod.rs` files are not allowed, found `src/bad/mod.rs`
  --> src/bad/mod.rs:1:1
   |
diff --git a/tests/ui-cargo/module_style/pass_mod/Cargo.stderr b/tests/ui-cargo/module_style/pass_mod/Cargo.stderr
@@ -1,2 +1 @@
-    Checking pass-mod v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/module_style/pass_no_mod/Cargo.stderr b/tests/ui-cargo/module_style/pass_no_mod/Cargo.stderr
@@ -1,2 +1 @@
-    Checking pass-no-mod v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/multiple_config_files/no_warn/Cargo.stderr b/tests/ui-cargo/multiple_config_files/no_warn/Cargo.stderr
@@ -1,2 +1 @@
-    Checking no_warn v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/multiple_config_files/warn/Cargo.stderr b/tests/ui-cargo/multiple_config_files/warn/Cargo.stderr
@@ -1,4 +1,3 @@
-    Checking warn v0.1.0 ($DIR/$DIR)
 Using config file `$DIR/$DIR/.clippy.toml`
 Warning: `$DIR/$DIR/clippy.toml` will be ignored.
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/multiple_crate_versions/5041_allow_dev_build/Cargo.stderr b/tests/ui-cargo/multiple_crate_versions/5041_allow_dev_build/Cargo.stderr
@@ -1,4 +1 @@
-    Checking nix v0.9.0
-    Checking ctrlc v3.1.0
-    Checking multiple_crate_versions v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/multiple_crate_versions/fail/Cargo.stderr b/tests/ui-cargo/multiple_crate_versions/fail/Cargo.stderr
@@ -1,10 +1,3 @@
-    Checking void v1.0.2
-    Checking cfg-if v0.1.10
-    Checking bitflags v0.9.1
-    Checking ansi_term v0.11.0
-    Checking nix v0.9.0
-    Checking ctrlc v3.1.0
-    Checking multiple_crate_versions v0.1.0 ($DIR/$DIR)
 warning: multiple versions for dependency `winapi`: 0.2.8, 0.3.9
   |
 note: the lint level is defined here
diff --git a/tests/ui-cargo/multiple_crate_versions/pass/Cargo.stderr b/tests/ui-cargo/multiple_crate_versions/pass/Cargo.stderr
@@ -1,2 +1 @@
-    Checking multiple_crate_versions v0.1.0 ($DIR/$DIR)
     Finished dev [unoptimized + debuginfo] target(s) 
diff --git a/tests/ui-cargo/wildcard_dependencies/fail/Cargo.stderr b/tests/ui-cargo/wildcard_dependencies/fail/Cargo.stderr
@@ -1,7 +1,3 @@
-    Checking regex-syntax v0.6.28
-    Checking aho-corasick v0.7.20
-    Checking regex v1.7.1
-    Checking wildcard_dependencies v0.1.0 ($DIR/$DIR)
 warning: wildcard dependency for `regex`
   |
 note: the lint level is defined here

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`- Checking cargo_common_metadata_fail v0.1.0 ($DIR/$DIR)`
`2`	`1`	warning: package `cargo_common_metadata_fail` is missing `package.description` metadata
`3`	`2`	`\|`
`4`	`3`	`note: the lint level is defined here`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`- Checking cargo_common_metadata_fail_publish v0.1.0 ($DIR/$DIR)`
`2`	`1`	warning: package `cargo_common_metadata_fail_publish` is missing `package.description` metadata
`3`	`2`	`\|`
`4`	`3`	`note: the lint level is defined here`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`- Checking cargo_common_metadata_pass v0.1.0 ($DIR/$DIR)`
`2`	`1`	`Finished dev [unoptimized + debuginfo] target(s)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`- Checking cargo_common_metadata_pass_publish_empty v0.1.0 ($DIR/$DIR)`
`2`	`1`	`Finished dev [unoptimized + debuginfo] target(s)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`- Checking fail-both-diff v0.1.0 ($DIR/$DIR)`
`2`	`1`	warning: the MSRV in `clippy.toml` and `Cargo.toml` differ; using `1.59.0` from `clippy.toml`
`3`	`2`
`4`	`3`	`error: unnecessary structure name repetition`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`- Checking fail-both-same v0.1.0 ($DIR/$DIR)`
`2`	`1`	`error: unnecessary structure name repetition`
`3`	`2`	`--> src/main.rs:6:21`
`4`	`3`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`- Checking fail-cargo v0.1.0 ($DIR/$DIR)`
`2`	`1`	`error: unnecessary structure name repetition`
`3`	`2`	`--> src/main.rs:6:21`
`4`	`3`	`\|`