From: Gilad Naaman <gilad.naaman@gmail.com>
Date: Fri, 26 Jan 2018 16:23:44 +0000 (+0200)
Subject: Fixed relaxed libtest tests
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~3^2~22^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=64f20e4d440b8afed02de8bd3da2b312c75e237a;p=cargo.git

Fixed relaxed libtest tests
---

diff --git a/tests/bench.rs b/tests/bench.rs
index da29bc364..947f920e3 100644
--- a/tests/bench.rs
+++ b/tests/bench.rs
@@ -288,13 +288,12 @@ fn cargo_bench_failing_test() {
 
     // Force libtest into serial execution so that the test header will be printed.
     assert_that(p.cargo("bench").arg("--").arg("--test-threads=1"),
-                execs().with_stdout_contains("test bench_hello ... ")
-                       .with_either_contains(format!("\
-[COMPILING] foo v0.5.0 ({})
+                execs().with_stdout_contains("test bench_hello ...[..]")
+                       .with_stderr_contains(format!("\
+[COMPILING] foo v0.5.0 ({})[..]
 [FINISHED] release [optimized] target(s) in [..]
-[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
-thread '[..]' panicked at 'assertion failed: \
-    `(left == right)`[..]", p.url()))
+[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]", p.url()))
+                       .with_either_contains("[..]thread '[..]' panicked at 'assertion failed: `(left == right)`[..]")
                        .with_either_contains("[..]left: `\"hello\"`[..]")
                        .with_either_contains("[..]right: `\"nope\"`[..]")
                        .with_either_contains("[..]src[/]main.rs:15[..]")