From aca5261718aa37a80065a56890cc9eb53cbc25b4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 18 Dec 2020 08:06:38 -0800 Subject: [PATCH] Revert "fix failures on linux" This reverts commit e729880f566839824d077d1be865ac5687fe0fdd. --- tests/testsuite/cross_compile.rs | 2 +- tests/testsuite/doc.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index 42c6e2260..a45124cf3 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -1109,7 +1109,7 @@ fn doctest_xcompile_linker() { .masquerade_as_nightly_cargo() .with_stderr_contains(&format!( "\ -[RUNNING] `rustdoc --crate-type lib --crate-name foo --test [..]\ +[RUNNING] `rustdoc --crate-type lib --test [..]\ --target {target} [..] -C linker=my-linker-tool[..] ", target = target, diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index fed034da2..16ec9cb49 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -1692,7 +1692,7 @@ fn doc_test_in_workspace() { running 1 test test crate-a/src/lib.rs - (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 ", ) @@ -1702,7 +1702,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out[..] running 1 test test crate-b/src/lib.rs - (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 ", )