about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo>2019-04-25 15:30:23 +0200
committerMichael Woerister <michaelwoerister@posteo>2019-04-26 16:52:04 +0200
commit68b692436342813c85f37e63f2d55760e37df242 (patch)
treea9042e33ea463990a51aa3f92a3cb6e280f3ed7e /src/tools/compiletest
parent3ee936378662bd2e74be951d6a7011a95a6bd84d (diff)
downloadrust-68b692436342813c85f37e63f2d55760e37df242.tar.gz
rust-68b692436342813c85f37e63f2d55760e37df242.zip
compiletest: Make the LLVM FileCheck tool available to run-make tests.
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/runtest.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 9db16b69e5f..0dff218d88a 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2691,6 +2691,10 @@ impl<'test> TestCx<'test> {
             cmd.env("CLANG", clang);
         }
 
+        if let Some(ref filecheck) = self.config.llvm_filecheck {
+            cmd.env("LLVM_FILECHECK", filecheck);
+        }
+
         // We don't want RUSTFLAGS set from the outside to interfere with
         // compiler flags set in the test cases:
         cmd.env_remove("RUSTFLAGS");