Skip to content

Commit 971219c

Browse files
committed
Use --quiet to reduce the need for output normalization
1 parent 29c179c commit 971219c

File tree

28 files changed

+1
-67
lines changed

28 files changed

+1
-67
lines changed

tests/compile-test.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ fn run_ui_cargo() {
110110
"clippy".into(),
111111
"--color".into(),
112112
"never".into(),
113+
"--quiet".into(),
113114
"--target-dir".into(),
114115
"target/ui_test_cargo".into(),
115116
"--manifest-path".into(),
@@ -118,15 +119,6 @@ fn run_ui_cargo() {
118119
config.out_dir = None;
119120
config.edition = None;
120121

121-
config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", "");
122-
config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", "");
123-
config.stderr_filter("( +Running [^(]+).*", "$1");
124-
config.stderr_filter(" *Blocking waiting for.*\n", "");
125-
config.stderr_filter(" *(Compiling|Downloaded|Downloading|Checking) .*\n", "");
126-
config.stderr_filter(r#""--out-dir"(,)? "[^"]+""#, r#""--out-dir"$1 "$$TMP"#);
127-
config.stderr_filter("( *process didn't exit successfully: `[^-]+)-[0-9a-f]+", "$1-HASH");
128-
// The order of the `/deps` directory flag is flaky
129-
config.stderr_filter("/deps", "");
130122
config.stderr_filter(
131123
&std::path::Path::new(file!())
132124
.parent()
@@ -139,10 +131,6 @@ fn run_ui_cargo() {
139131
.to_string(),
140132
"$$DIR",
141133
);
142-
config.stderr_filter("[0-9a-f]+\\.rmeta", "$$HASH.rmeta");
143-
config.stderr_filter(r#"(panic.*)\.rs:[0-9]+:[0-9]+"#, "$1.rs");
144-
config.stderr_filter("failed to parse rustc version info.*", "");
145-
146134
ui_test::run_tests_generic(config, |path| path.ends_with("Cargo.toml")).unwrap();
147135
}
148136

tests/ui-cargo/cargo_common_metadata/fail/Cargo.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ warning: package `cargo_common_metadata_fail` is missing `package.keywords` meta
1616

1717
warning: package `cargo_common_metadata_fail` is missing `package.categories` metadata
1818

19-
warning: `cargo_common_metadata_fail` (bin "cargo_common_metadata_fail") generated 6 warnings
20-
Finished dev [unoptimized + debuginfo] target(s)

tests/ui-cargo/cargo_common_metadata/fail_publish/Cargo.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ warning: package `cargo_common_metadata_fail_publish` is missing `package.keywor
1616

1717
warning: package `cargo_common_metadata_fail_publish` is missing `package.categories` metadata
1818

19-
warning: `cargo_common_metadata_fail_publish` (bin "cargo_common_metadata_fail_publish") generated 6 warnings
20-
Finished dev [unoptimized + debuginfo] target(s)

tests/ui-cargo/cargo_common_metadata/fail_publish_true/Cargo.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ warning: package `cargo_common_metadata_fail_publish_true` is missing `package.k
1616

1717
warning: package `cargo_common_metadata_fail_publish_true` is missing `package.categories` metadata
1818

19-
warning: `cargo_common_metadata_fail_publish_true` (bin "cargo_common_metadata_fail_publish_true") generated 6 warnings
20-
Finished dev [unoptimized + debuginfo] target(s)

tests/ui-cargo/cargo_common_metadata/pass/Cargo.stderr

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/ui-cargo/cargo_common_metadata/pass_publish_empty/Cargo.stderr

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/ui-cargo/cargo_common_metadata/pass_publish_false/Cargo.stderr

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/ui-cargo/cargo_rust_version/fail_both_diff/Cargo.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ error: unnecessary structure name repetition
1818
7 | Foo
1919
| ^^^ help: use the applicable keyword: `Self`
2020

21-
warning: `fail-both-diff` (bin "fail-both-diff") generated 1 warning
2221
error: could not compile `fail-both-diff` due to 2 previous errors; 1 warning emitted

tests/ui-cargo/cargo_rust_version/pass_both_same/Cargo.stderr

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/ui-cargo/cargo_rust_version/pass_cargo/Cargo.stderr

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)