OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compiletest: Make LLVM's bin directory available to run-make-fulldeps tests.

Browse Source
This commit is contained in:
Michael Woerister 2019-04-29 14:38:25 +02:00
parent 4dc3b99b27
commit 29cf3f54ab
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/test.rs
View File

@ -1231,6 +1231,13 @@ impl Step for Compiletest {
if let Some(ar) = builder.ar(target) {
cmd.arg("--ar").arg(ar);
}
// The llvm/bin directory contains many useful cross-platform
// tools. Pass the path to run-make tests so they can use them.
let llvm_bin_path = llvm_config.parent()
.expect("Expected llvm-config to be contained in directory");
assert!(llvm_bin_path.is_dir());
cmd.arg("--llvm-bin-dir").arg(llvm_bin_path);
}
}

3
src/tools/compiletest/src/common.rs
View File

@ -144,6 +144,9 @@ pub struct Config {
/// The LLVM `FileCheck` binary path.
pub llvm_filecheck: Option<PathBuf>,
/// Path to LLVM's bin directory.
pub llvm_bin_dir: Option<PathBuf>,
/// The valgrind path.
pub valgrind_path: Option<String>,

4
src/tools/compiletest/src/main.rs
View File

@ -221,6 +221,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
"LIST",
)
.reqopt("", "llvm-cxxflags", "C++ flags for LLVM", "FLAGS")
.optopt("", "llvm-bin-dir", "Path to LLVM's `bin` directory", "PATH")
.optopt("", "nodejs", "the name of nodejs", "PATH")
.optopt(
"",
@ -306,7 +307,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
valgrind_path: matches.opt_str("valgrind-path"),
force_valgrind: matches.opt_present("force-valgrind"),
run_clang_based_tests_with: matches.opt_str("run-clang-based-tests-with"),
llvm_filecheck: matches.opt_str("llvm-filecheck").map(|s| PathBuf::from(&s)),
llvm_filecheck: matches.opt_str("llvm-filecheck").map(PathBuf::from),
llvm_bin_dir: matches.opt_str("llvm-bin-dir").map(PathBuf::from),
src_base,
build_base: opt_path(matches, "build-base"),
stage_id: matches.opt_str("stage-id").unwrap(),

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

@ -2695,6 +2695,10 @@ impl<'test> TestCx<'test> {
cmd.env("LLVM_FILECHECK", filecheck);
}
if let Some(ref llvm_bin_dir) = self.config.llvm_bin_dir {
cmd.env("LLVM_BIN_DIR", llvm_bin_dir);
}
// We don't want RUSTFLAGS set from the outside to interfere with
// compiler flags set in the test cases:
cmd.env_remove("RUSTFLAGS");