From a90a9632659a11264cf9a27273ecc83d52cb4e9f Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 15 May 2018 16:39:21 -0700
Subject: Fix run-make wasm tests

Fixes #50711
---
 src/bootstrap/test.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/bootstrap')

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("")
-- 
cgit 1.4.1-3-g733a5