diff options
| author | Eric Huss <eric@huss.org> | 2018-05-15 16:39:21 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2018-05-15 16:39:21 -0700 |
| commit | a90a9632659a11264cf9a27273ecc83d52cb4e9f (patch) | |
| tree | d91eea1a08b7069fc1f1e4929e5e826ae6a6908a /src/tools | |
| parent | 27acb9b3c033e1dd74cc72310a5a346527d3e704 (diff) | |
| download | rust-a90a9632659a11264cf9a27273ecc83d52cb4e9f.tar.gz rust-a90a9632659a11264cf9a27273ecc83d52cb4e9f.zip | |
Fix run-make wasm tests
Fixes #50711
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index e8b140978b5..0899ebd5d80 100644 --- 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) |