about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-06-12 18:18:32 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-06-16 12:23:22 +0300
commit932ea641758e2fe20500151e80a4968cc0799078 (patch)
tree81fc8052a1707477bf45d7ec7cd901a44686e8b6 /src/tools/compiletest
parent8e8fba1b3bb96bb64f104d85618cab4fe7dc0740 (diff)
downloadrust-932ea641758e2fe20500151e80a4968cc0799078.tar.gz
rust-932ea641758e2fe20500151e80a4968cc0799078.zip
compiletest: Remove `skip-codegen`
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/header.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 1f52421ecbc..e4765c641aa 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -539,13 +539,10 @@ impl TestProps {
             let pass_mode = if config.parse_name_directive(ln, "check-pass") {
                 check_no_run("check-pass");
                 Some(PassMode::Check)
-            } else if config.parse_name_directive(ln, "skip-codegen") {
-                check_no_run("skip-codegen");
-                Some(PassMode::Check)
             } else if config.parse_name_directive(ln, "build-pass") {
                 check_no_run("build-pass");
                 Some(PassMode::Build)
-            } else if config.parse_name_directive(ln, "compile-pass") {
+            } else if config.parse_name_directive(ln, "compile-pass") /* compatibility */ {
                 check_no_run("compile-pass");
                 Some(PassMode::Build)
             } else if config.parse_name_directive(ln, "run-pass") {
@@ -558,7 +555,6 @@ impl TestProps {
             };
             match (self.pass_mode, pass_mode) {
                 (None, Some(_)) => self.pass_mode = pass_mode,
-                (Some(_), Some(pm)) if pm == PassMode::Check => self.pass_mode = pass_mode,
                 (Some(_), Some(_)) => panic!("multiple `*-pass` headers in a single test"),
                 (_, None) => {}
             }