Skip to content

Commit 85a746c

Browse files
borsehuss
authored andcommitted
Auto merge of rust-lang#8884 - jakoschiko:accept-test-execution-time, r=alexcrichton
Relaxes expectation of `cargo test` tests to accept test execution time rust-lang/rust#75752 changes the output of libtest. For example, output before: ``` test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ``` Output after: ``` test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s ``` This breaks some cargo tests: https://github.com/rust-lang-ci/rust/runs/1439245145 As a preparation for the merge, this PR relaxes the test expectations of `cargo test` tests to accept both outputs. I'm using the existing pattern feature of `Execs::with_stdout`: ``` test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] ``` I made this change for the following tests: - `test::can_not_mix_doc_tests_and_regular_tests` - `test::cargo_test_quiet_with_harness` - `test::test_filtered_excludes_compiling_examples` - `test::cargo_test_doctest_xcompile_ignores` (didn't fail in rust-lang/rust#79317, but failed locally) - `test::cargo_test_doctest_xcompile` (doesn't run locally, I changed it just to be safe) - `test::cargo_test_doctest_xcompile_runner` (doesn't run locally, I changed it just to be safe) - `test::cargo_test_doctest_xcompile_no_runner` (doesn't run locally, I changed it just to be safe) If requested, I will open another PR later to change the expectation to: ``` test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in [..]s ``` However, I don't know how to handle WASM targets because WASM doesn't support time measuring, therefore the libtest output didn't change for WASM. Is WASM even relevant here?
1 parent e69b590 commit 85a746c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tests/testsuite/test.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ fn cargo_test_quiet_with_harness() {
175175
"
176176
running 1 test
177177
.
178-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
178+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
179179
180180
",
181181
)
@@ -1552,7 +1552,7 @@ fn test_filtered_excludes_compiling_examples() {
15521552
running 1 test
15531553
test tests::foo ... ok
15541554
1555-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
1555+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
15561556
15571557
",
15581558
)
@@ -3724,13 +3724,13 @@ pub fn foo() -> u8 { 1 }
37243724
running 1 test
37253725
test tests::it_works ... ok
37263726
3727-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
3727+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
37283728
37293729
37303730
running 1 test
37313731
test src/lib.rs - foo (line 1) ... ok
37323732
3733-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
3733+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
37343734
\n",
37353735
)
37363736
.run();
@@ -3746,7 +3746,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
37463746
running 1 test
37473747
test tests::it_works ... ok
37483748
3749-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
3749+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
37503750
\n",
37513751
)
37523752
.run();
@@ -3763,7 +3763,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
37633763
running 1 test
37643764
test src/lib.rs - foo (line 1) ... ok
37653765
3766-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
3766+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]
37673767
37683768
",
37693769
)
@@ -3877,30 +3877,30 @@ fn cargo_test_doctest_xcompile_ignores() {
38773877
#[cfg(not(target_arch = "x86_64"))]
38783878
p.cargo("test")
38793879
.with_stdout_contains(
3880-
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out",
3880+
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]",
38813881
)
38823882
.run();
38833883
#[cfg(target_arch = "x86_64")]
38843884
p.cargo("test")
38853885
.with_status(101)
38863886
.with_stdout_contains(
3887-
"test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out",
3887+
"test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out[..]",
38883888
)
38893889
.run();
38903890

38913891
#[cfg(not(target_arch = "x86_64"))]
38923892
p.cargo("test -Zdoctest-xcompile")
38933893
.masquerade_as_nightly_cargo()
38943894
.with_stdout_contains(
3895-
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out",
3895+
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]",
38963896
)
38973897
.run();
38983898

38993899
#[cfg(target_arch = "x86_64")]
39003900
p.cargo("test -Zdoctest-xcompile")
39013901
.masquerade_as_nightly_cargo()
39023902
.with_stdout_contains(
3903-
"test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out",
3903+
"test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out[..]",
39043904
)
39053905
.run();
39063906
}
@@ -3940,7 +3940,7 @@ fn cargo_test_doctest_xcompile() {
39403940
))
39413941
.masquerade_as_nightly_cargo()
39423942
.with_stdout_contains(
3943-
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out",
3943+
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]",
39443944
)
39453945
.run();
39463946
}
@@ -4020,7 +4020,7 @@ fn cargo_test_doctest_xcompile_runner() {
40204020
))
40214021
.masquerade_as_nightly_cargo()
40224022
.with_stdout_contains(
4023-
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out",
4023+
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]",
40244024
)
40254025
.with_stderr_contains("this is a runner")
40264026
.run();
@@ -4064,7 +4064,7 @@ fn cargo_test_doctest_xcompile_no_runner() {
40644064
))
40654065
.masquerade_as_nightly_cargo()
40664066
.with_stdout_contains(
4067-
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out",
4067+
"test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]",
40684068
)
40694069
.run();
40704070
}

0 commit comments

Comments
 (0)