diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /user/rust/0012-test-failed-doctest-output-Fix-normalization.patch | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
Diffstat (limited to 'user/rust/0012-test-failed-doctest-output-Fix-normalization.patch')
| -rw-r--r-- | user/rust/0012-test-failed-doctest-output-Fix-normalization.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch b/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch new file mode 100644 index 000000000..37723d14b --- /dev/null +++ b/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch @@ -0,0 +1,36 @@ +From 288b1c1845096034f370b78f0c2ff3e31c468581 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 7 Oct 2019 18:36:28 -0500 +Subject: [PATCH 12/18] 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 d2cdeb8f8f5..0e3f765fda6 100644 +--- a/src/test/rustdoc-ui/failed-doctest-output.rs ++++ b/src/test/rustdoc-ui/failed-doctest-output.rs +@@ -3,7 +3,7 @@ + // adapted to use that, and that normalize line can go away + + // compile-flags:--test +-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" ++// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" + // failure-status: 101 + + // doctest fails at runtime +-- +2.21.0 + |