Rollup merge of rust-lang#50787 - ehuss:fix-run-make-wasm, r=alexcric…

…hton Fix run-make wasm tests Fixes rust-lang#50711
kennytm · May 16, 2018 · 9ced69d · 9ced69d
2 parents 380066b + a90a963
commit 9ced69d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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("")

diff --git a/src/test/run-make/cross-lang-lto/Makefile → ...run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make/cross-lang-lto/Makefile → ...run-make-fulldeps/cross-lang-lto/Makefile
@@ -2,7 +2,7 @@
 # min-llvm-version 4.0
 # ignore-mingw
 
--include ../../run-make-fulldeps/tools.mk
+-include ../tools.mk
 
 # This test makes sure that the expected .llvmbc sections for use by
 # linker-based LTO are available in object files when compiling with

diff --git a/src/test/run-make/cross-lang-lto/lib.rs → ...t/run-make-fulldeps/cross-lang-lto/lib.rs b/src/test/run-make/cross-lang-lto/lib.rs → ...t/run-make-fulldeps/cross-lang-lto/lib.rs
diff --git a/src/test/run-make/cross-lang-lto/main.rs → .../run-make-fulldeps/cross-lang-lto/main.rs b/src/test/run-make/cross-lang-lto/main.rs → .../run-make-fulldeps/cross-lang-lto/main.rs
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
@@ -614,8 +614,8 @@ pub fn is_test(file_name: &OsString) -> bool {
 }
 
 pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn {
-
     let early_props = if config.mode == Mode::RunMake {
+        // Allow `ignore` directives to be in the Makefile.
         EarlyProps::from_file(config, &testpaths.file.join("Makefile"))
     } else {
         EarlyProps::from_file(config, &testpaths.file)