about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2018-09-19 11:17:43 +0200
committerFelix S. Klock II <pnkfelix@pnkfx.org>2018-09-21 16:21:40 +0200
commit1eb8690cf3082502e9ffafa4bb8cf46e758a3978 (patch)
tree01d58c618fb8a3052c6f3ad2bf0986587cdbdfcb
parent9e33d575177dd77adce3642dbf8501dac21d8e93 (diff)
downloadrust-1eb8690cf3082502e9ffafa4bb8cf46e758a3978.tar.gz
rust-1eb8690cf3082502e9ffafa4bb8cf46e758a3978.zip
Make the `// skip-codegen` property apply to ui tests too.
-rw-r--r--src/tools/compiletest/src/runtest.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 58510af4dfb..401dec7b184 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -262,11 +262,12 @@ impl<'test> TestCx<'test> {
     }
 
     fn should_run_successfully(&self) -> bool {
-        match self.config.mode {
-            RunPass => !self.props.skip_codegen,
+        let run_pass = match self.config.mode {
+            RunPass => true,
             Ui => self.props.run_pass,
             _ => unimplemented!(),
-        }
+        };
+        return run_pass && !self.props.skip_codegen;
     }
 
     fn should_compile_successfully(&self) -> bool {