diff options
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index fb8ea5fb341..1f81a617237 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -838,7 +838,7 @@ test!(RunFailFullDepsPretty { host: true }); -host_test!(RunMake { +default_test!(RunMake { path: "src/test/run-make", mode: "run-make", suite: "run-make" @@ -1041,7 +1041,7 @@ impl Step for Compiletest { // Only pass correct values for these flags for the `run-make` suite as it // requires that a C++ compiler was configured which isn't always the case. - if !builder.config.dry_run && mode == "run-make" { + if !builder.config.dry_run && suite == "run-make-fulldeps" { let llvm_components = output(Command::new(&llvm_config).arg("--components")); let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags")); cmd.arg("--cc").arg(builder.cc(target)) @@ -1054,13 +1054,13 @@ impl Step for Compiletest { } } } - if mode == "run-make" && !builder.config.llvm_enabled { + if suite == "run-make-fulldeps" && !builder.config.llvm_enabled { builder.info( &format!("Ignoring run-make test suite as they generally don't work without LLVM")); return; } - if mode != "run-make" { + if suite != "run-make-fulldeps" { cmd.arg("--cc").arg("") .arg("--cxx").arg("") .arg("--cflags").arg("") |