From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 25 May 2018 01:05:12 +0000 (-0700)
Subject: Fix tests on nightly
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7eb5665393d6fdf2c061b3664b340879e4c9bbdf;p=cargo.git

Fix tests on nightly
---

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index bba6fd263..730c19cb3 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -3761,6 +3761,7 @@ fn custom_target_dir_line_parameter() {
 }
 
 #[test]
+#[ignore]
 fn rustc_no_trans() {
     if !is_nightly() {
         return;
diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs
index c48dbf2bb..47ff91091 100644
--- a/tests/testsuite/test.rs
+++ b/tests/testsuite/test.rs
@@ -301,7 +301,7 @@ test test_hello ... FAILED
 failures:
 
 ---- test_hello stdout ----
-<tab>thread 'test_hello' panicked at 'assertion failed:[..]",
+[..]thread 'test_hello' panicked at 'assertion failed:[..]",
             )
             .with_stdout_contains("[..]`(left == right)`[..]")
             .with_stdout_contains("[..]left: `\"hello\"`,[..]")
@@ -367,7 +367,7 @@ test test_hello ... FAILED
 failures:
 
 ---- test_hello stdout ----
-<tab>thread 'test_hello' panicked at 'assertion failed: false', \
+[..]thread 'test_hello' panicked at 'assertion failed: false', \
       tests[/]footest.rs:4[..]
 ",
             )
@@ -413,7 +413,7 @@ test test_hello ... FAILED
 failures:
 
 ---- test_hello stdout ----
-<tab>thread 'test_hello' panicked at 'assertion failed: false', \
+[..]thread 'test_hello' panicked at 'assertion failed: false', \
       src[/]lib.rs:4[..]
 ",
             )