user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Michael Woerister 2019-04-25 15:30:23 +02:00
parent 3ee9363786
commit 68b6924363
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/run-make-fulldeps/tools.mk
View file

@ -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

4
src/tools/compiletest/src/runtest.rs
View file

@ -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");