From e69b590ccbddfcce84123aecce9b23b433052f0e Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 30 Nov 2020 08:12:02 -0800 Subject: [PATCH 1/3] Remove version from dev-dependencies to make it easier to publish. --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f1d1b61f26a..f8156d6667d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,8 +103,8 @@ features = [ ] [dev-dependencies] -cargo-test-macro = { path = "crates/cargo-test-macro", version = "0.1.0" } -cargo-test-support = { path = "crates/cargo-test-support", version = "0.1.0" } +cargo-test-macro = { path = "crates/cargo-test-macro" } +cargo-test-support = { path = "crates/cargo-test-support" } [build-dependencies] flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } From 85a746c5f4d5b10486650714b0b45d9a82be9ee0 Mon Sep 17 00:00:00 2001 From: bors Date: Mon, 23 Nov 2020 17:03:57 +0000 Subject: [PATCH 2/3] Auto merge of #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? --- tests/testsuite/test.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index 4ba9a4db833..55345c216c8 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -175,7 +175,7 @@ fn cargo_test_quiet_with_harness() { " running 1 test . -test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] ", ) @@ -1552,7 +1552,7 @@ fn test_filtered_excludes_compiling_examples() { running 1 test test tests::foo ... ok -test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] ", ) @@ -3724,13 +3724,13 @@ pub fn foo() -> u8 { 1 } running 1 test test tests::it_works ... ok -test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] running 1 test test src/lib.rs - foo (line 1) ... ok -test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] \n", ) .run(); @@ -3746,7 +3746,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out running 1 test test tests::it_works ... ok -test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] \n", ) .run(); @@ -3763,7 +3763,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out running 1 test test src/lib.rs - foo (line 1) ... ok -test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] ", ) @@ -3877,14 +3877,14 @@ fn cargo_test_doctest_xcompile_ignores() { #[cfg(not(target_arch = "x86_64"))] p.cargo("test") .with_stdout_contains( - "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out", + "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]", ) .run(); #[cfg(target_arch = "x86_64")] p.cargo("test") .with_status(101) .with_stdout_contains( - "test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out", + "test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out[..]", ) .run(); @@ -3892,7 +3892,7 @@ fn cargo_test_doctest_xcompile_ignores() { p.cargo("test -Zdoctest-xcompile") .masquerade_as_nightly_cargo() .with_stdout_contains( - "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out", + "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]", ) .run(); @@ -3900,7 +3900,7 @@ fn cargo_test_doctest_xcompile_ignores() { p.cargo("test -Zdoctest-xcompile") .masquerade_as_nightly_cargo() .with_stdout_contains( - "test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out", + "test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out[..]", ) .run(); } @@ -3940,7 +3940,7 @@ fn cargo_test_doctest_xcompile() { )) .masquerade_as_nightly_cargo() .with_stdout_contains( - "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out", + "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]", ) .run(); } @@ -4020,7 +4020,7 @@ fn cargo_test_doctest_xcompile_runner() { )) .masquerade_as_nightly_cargo() .with_stdout_contains( - "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out", + "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]", ) .with_stderr_contains("this is a runner") .run(); @@ -4064,7 +4064,7 @@ fn cargo_test_doctest_xcompile_no_runner() { )) .masquerade_as_nightly_cargo() .with_stdout_contains( - "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out", + "test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..]", ) .run(); } From 9dfd852ede30605c30a64c1b5a7eebb86a85000a Mon Sep 17 00:00:00 2001 From: bors Date: Sun, 29 Nov 2020 18:24:49 +0000 Subject: [PATCH 3/3] Auto merge of #8907 - ehuss:auto_traits, r=alexcrichton Fix custom_target_dependency test. The feature was renamed in https://github.com/rust-lang/rust/pull/79336 --- tests/testsuite/custom_target.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testsuite/custom_target.rs b/tests/testsuite/custom_target.rs index 88b84d06193..ef425730d99 100644 --- a/tests/testsuite/custom_target.rs +++ b/tests/testsuite/custom_target.rs @@ -62,7 +62,7 @@ fn custom_target_minimal() { #[cargo_test] fn custom_target_dependency() { if !is_nightly() { - // Requires features no_core, lang_items, optin_builtin_traits + // Requires features no_core, lang_items, auto_traits return; } let p = project() @@ -84,7 +84,7 @@ fn custom_target_dependency() { r#" #![feature(no_core)] #![feature(lang_items)] - #![feature(optin_builtin_traits)] + #![feature(auto_traits)] #![no_core] extern crate bar;