summaryrefslogblamecommitdiff
path: root/bootstrap/rust-1.70/0007-test-failed-doctest-output-Fix-normalization.patch
blob: 5907e5ee1542d9de9d1ca5f39c608a18dc45a712 (plain) (tree)
































                                                                                                  
From 99004a91f6455c835d2625c757f17ee15d2e084a Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Mon, 7 Oct 2019 18:36:28 -0500
Subject: [PATCH 07/13] 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
---
 tests/rustdoc-ui/failed-doctest-output.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rustdoc-ui/failed-doctest-output.rs b/tests/rustdoc-ui/failed-doctest-output.rs
index 77647f8eca954..8361f041ffca0 100644
--- a/tests/rustdoc-ui/failed-doctest-output.rs
+++ b/tests/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: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "[[:graph:]]*tests/rustdoc-ui" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101