From 97b971a77541c69626062ea6096888ecdee04464 Mon Sep 17 00:00:00 2001 From: varkor Date: Thu, 19 Apr 2018 19:19:11 +0100 Subject: [PATCH] Update tests to check for Checking --- tests/testsuite/cargotest/support/mod.rs | 1 + tests/testsuite/doc.rs | 8 ++++---- tests/testsuite/rustdoc.rs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/testsuite/cargotest/support/mod.rs b/tests/testsuite/cargotest/support/mod.rs index 9ee70bf7c..65c0f788f 100644 --- a/tests/testsuite/cargotest/support/mod.rs +++ b/tests/testsuite/cargotest/support/mod.rs @@ -992,6 +992,7 @@ fn substitute_macros(input: &str) -> String { let macros = [ ("[RUNNING]", " Running"), ("[COMPILING]", " Compiling"), + ("[CHECKING]", " Checking"), ("[CREATED]", " Created"), ("[FINISHED]", " Finished"), ("[ERROR]", "error:"), diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 0980042d5..82638b040 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -217,7 +217,7 @@ fn doc_no_deps() { p.cargo("doc").arg("--no-deps"), execs().with_status(0).with_stderr(&format!( "\ -[COMPILING] bar v0.0.1 ({dir}/bar) +[CHECKING] bar v0.0.1 ({dir}/bar) [DOCUMENTING] foo v0.0.1 ({dir}) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", @@ -596,7 +596,7 @@ fn doc_lib_bin_same_name_documents_named_bin_when_requested() { p.cargo("doc").arg("--bin").arg("foo"), execs().with_status(0).with_stderr(&format!( "\ -[COMPILING] foo v0.0.1 ({dir}) +[CHECKING] foo v0.0.1 ({dir}) [DOCUMENTING] foo v0.0.1 ({dir}) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", @@ -650,7 +650,7 @@ fn doc_lib_bin_same_name_documents_bins_when_requested() { p.cargo("doc").arg("--bins"), execs().with_status(0).with_stderr(&format!( "\ -[COMPILING] foo v0.0.1 ({dir}) +[CHECKING] foo v0.0.1 ({dir}) [DOCUMENTING] foo v0.0.1 ({dir}) [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", @@ -1270,7 +1270,7 @@ fn doc_all_workspace() { execs() .with_status(0) .with_stderr_contains("[..] Documenting bar v0.1.0 ([..])") - .with_stderr_contains("[..] Compiling bar v0.1.0 ([..])") + .with_stderr_contains("[..] Checking bar v0.1.0 ([..])") .with_stderr_contains("[..] Documenting foo v0.1.0 ([..])"), ); } diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs index 06e20c20e..d18df7687 100644 --- a/tests/testsuite/rustdoc.rs +++ b/tests/testsuite/rustdoc.rs @@ -109,7 +109,7 @@ fn rustdoc_foo_with_bar_dependency() { foo.cargo("rustdoc").arg("-v").arg("--").arg("--cfg=foo"), execs().with_status(0).with_stderr(format!( "\ -[COMPILING] bar v0.0.1 ([..]) +[CHECKING] bar v0.0.1 ([..]) [RUNNING] `rustc [..]bar[/]src[/]lib.rs [..]` [DOCUMENTING] foo v0.0.1 ({url}) [RUNNING] `rustdoc --crate-name foo src[/]lib.rs \ -- 2.30.2