From 26ba9c852ad73dcc0401b74534b34bf33d5b6444 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 7 Oct 2019 18:36:28 -0500 Subject: [PATCH 08/14] test/failed-doctest-output: Fix normalization Otherwise we get: 1 2 running 2 tests - test $DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED - test $DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED + test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED + test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED 5 6 failures: 7 --- src/test/rustdoc-ui/failed-doctest-output.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs index 92473b49e14..ed29b446aba 100644 --- a/src/test/rustdoc-ui/failed-doctest-output.rs +++ b/src/test/rustdoc-ui/failed-doctest-output.rs @@ -7,7 +7,7 @@ // compile-flags:--test --test-args --test-threads=1 // rustc-env:RUST_BACKTRACE=0 -// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" +// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" // failure-status: 101 -- 2.35.1