Skip to content

Commit 6c44218

Browse files
committed
Normalize away download messages
1 parent a3116a5 commit 6c44218

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tests/integration.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ fn run(name: &str, mode: Mode) -> Result<()> {
3535
};
3636

3737
config.stderr_filter("in [0-9\\.]+s", "");
38-
config.stderr_filter("( Running [^(]+).*", "$1");
39-
config.stderr_filter(" Compiling .*\n", "");
38+
config.stderr_filter("( +Running [^(]+).*", "$1");
39+
config.stderr_filter(" *(Compiling|Downloaded|Downloading) .*\n", "");
40+
// The order of the `/deps` directory flag is flaky
41+
config.stderr_filter("/deps", "");
4042
config.stderr_filter(
4143
&std::path::Path::new(path)
4244
.canonicalize()

tests/integrations/basic-fail/Cargo.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tests/actual_tests/bad_pattern.rs ... FAILED
77
tests/actual_tests/foomp.rs ... FAILED
88

99
tests/actual_tests/bad_pattern.rs FAILED:
10-
command: "rustc" "--error-format=json" "--edition=2021" "--extern" "basic_fail=$DIR/$DIR/../../../target/debug/deps/libbasic_fail-$HASH.rmeta" "-L" "$DIR/$DIR/../../../target/debug/deps" "-L" "$DIR/$DIR/../../../target/debug" "tests/actual_tests/bad_pattern.rs"
10+
command: "rustc" "--error-format=json" "--edition=2021" "--extern" "basic_fail=$DIR/$DIR/../../../target/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/$DIR/../../../target/debug" "-L" "$DIR/$DIR/../../../target/debug" "tests/actual_tests/bad_pattern.rs"
1111

1212
substring `miesmätsched types` not found in stderr output
1313
expected because of pattern here: tests/actual_tests/bad_pattern.rs:5
@@ -37,7 +37,7 @@ For more information about this error, try `rustc --explain E0308`.
3737

3838

3939
tests/actual_tests/foomp.rs FAILED:
40-
command: "rustc" "--error-format=json" "--edition=2021" "--extern" "basic_fail=$DIR/$DIR/../../../target/debug/deps/libbasic_fail-$HASH.rmeta" "-L" "$DIR/$DIR/../../../target/debug/deps" "-L" "$DIR/$DIR/../../../target/debug" "tests/actual_tests/foomp.rs"
40+
command: "rustc" "--error-format=json" "--edition=2021" "--extern" "basic_fail=$DIR/$DIR/../../../target/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/$DIR/../../../target/debug" "-L" "$DIR/$DIR/../../../target/debug" "tests/actual_tests/foomp.rs"
4141

4242
actual output differed from expected tests/actual_tests/foomp.stderr
4343
Diff < left / right > :

0 commit comments

Comments
 (0)