bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix run-make wasm tests

Browse source 
Fixes #50711
This commit is contained in:
Eric Huss 2018-05-15 16:39:21 -07:00
parent 27acb9b3c0
commit a90a963265
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/test.rs
View file

@ -838,7 +838,7 @@ test!(RunFailFullDepsPretty {
host: true host: true
}); });
host_test!(RunMake { default_test!(RunMake {
path: "src/test/run-make", path: "src/test/run-make",
mode: "run-make", mode: "run-make",
suite: "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 // 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. // 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_components = output(Command::new(&llvm_config).arg("--components"));
let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags")); let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags"));
cmd.arg("--cc").arg(builder.cc(target)) 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( builder.info(
&format!("Ignoring run-make test suite as they generally don't work without LLVM")); &format!("Ignoring run-make test suite as they generally don't work without LLVM"));
return; return;
} }
if mode != "run-make" { if suite != "run-make-fulldeps" {
cmd.arg("--cc").arg("") cmd.arg("--cc").arg("")
.arg("--cxx").arg("") .arg("--cxx").arg("")
.arg("--cflags").arg("") .arg("--cflags").arg("")

2
src/test/run-make/cross-lang-lto/Makefile → src/test/run-make-fulldeps/cross-lang-lto/Makefile
View file

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

0
src/test/run-make/cross-lang-lto/lib.rs → src/test/run-make-fulldeps/cross-lang-lto/lib.rs
View file

0
src/test/run-make/cross-lang-lto/main.rs → src/test/run-make-fulldeps/cross-lang-lto/main.rs
View file

2
src/tools/compiletest/src/main.rs
View file

@ -614,8 +614,8 @@ pub fn is_test(file_name: &OsString) -> bool {
} }
pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn { pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn {
let early_props = if config.mode == Mode::RunMake { let early_props = if config.mode == Mode::RunMake {
// Allow `ignore` directives to be in the Makefile.
EarlyProps::from_file(config, &testpaths.file.join("Makefile")) EarlyProps::from_file(config, &testpaths.file.join("Makefile"))
} else { } else {
EarlyProps::from_file(config, &testpaths.file) EarlyProps::from_file(config, &testpaths.file)