diff options
| author | Tommy Ip <hkmp7tommy@gmail.com> | 2017-12-10 17:36:08 +0000 |
|---|---|---|
| committer | Tommy Ip <hkmp7tommy@gmail.com> | 2017-12-10 21:14:57 +0000 |
| commit | 81b8db218006daaee11bb2c61aa7e3d7386b9fa9 (patch) | |
| tree | d24e48348d51ddb38d8d479deb152b5b909d2f96 | |
| parent | 5990b8b57caaaf89024791bc053224cd1266aaf4 (diff) | |
| download | rust-81b8db218006daaee11bb2c61aa7e3d7386b9fa9.tar.gz rust-81b8db218006daaee11bb2c61aa7e3d7386b9fa9.zip | |
Imply must-compile-successfully in ui-tests when the run-pass flag is present.
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 8d8eb4d5cb8..1f736e33c8b 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -359,10 +359,6 @@ impl TestProps { self.forbid_output.push(of); } - if !self.must_compile_successfully { - self.must_compile_successfully = config.parse_must_compile_successfully(ln); - } - if !self.check_test_line_numbers_match { self.check_test_line_numbers_match = config.parse_check_test_line_numbers_match(ln); } @@ -371,6 +367,12 @@ impl TestProps { self.run_pass = config.parse_run_pass(ln); } + if !self.must_compile_successfully { + // run-pass implies must_compile_sucessfully + self.must_compile_successfully = + config.parse_must_compile_successfully(ln) || self.run_pass; + } + if let Some(rule) = config.parse_custom_normalization(ln, "normalize-stdout") { self.normalize_stdout.push(rule); } |
