From b1c62195607ba0b4862d1fcbece5385be73d48f1 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Sun, 12 Jun 2016 16:05:49 -0600
Subject: [PATCH] Unset RUST_NEW_ERROR_FORMAT in compiletest.

---
 tests/compiletest.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 2fc1e615cff..b64b091bf6f 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -19,6 +19,10 @@ fn run_mode(mode: &'static str) {
         config.mode = cfg_mode;
         config.src_base = PathBuf::from(format!("tests/{}", mode));
         config.target = target.to_owned();
+
+        // Disable rustc's new error fomatting. It breaks these tests.
+        std::env::remove_var("RUST_NEW_ERROR_FORMAT");
+
         compiletest::run_tests(&config);
     }
 }