Skip to content
Permalink
Browse files

compiletest: Make the LLVM FileCheck tool available to run-make tests.

  • Loading branch information...
michaelwoerister committed Apr 25, 2019
1 parent 3ee9363 commit 68b692436342813c85f37e63f2d55760e37df242
Showing with 5 additions and 0 deletions.
  1. +1 −0 src/test/run-make-fulldeps/tools.mk
  2. +4 −0 src/tools/compiletest/src/runtest.rs
@@ -47,6 +47,7 @@ DYLIB = $(TMPDIR)/$(1).dll
STATICLIB = $(TMPDIR)/$(1).lib
STATICLIB_GLOB = $(1)*.lib
BIN = $(1).exe
LLVM_FILECHECK := $(shell cygpath -u "$(LLVM_FILECHECK)")
else
RUN = $(TARGET_RPATH_ENV) $(RUN_BINFILE)
FAIL = $(TARGET_RPATH_ENV) $(RUN_BINFILE) && exit 1 || exit 0
@@ -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");

0 comments on commit 68b6924

Please sign in to comment.
You can’t perform that action at this time.