bye bye src/test/compile-fail.

rust-lang · Jun 25, 2019 · 3282050 · 3282050
1 parent 9723ed0
commit 3282050
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 23 deletions.
diff --git a/src/bootstrap/README.md b/src/bootstrap/README.md
@@ -216,7 +216,6 @@ build/
     # Output for all compiletest-based test suites
     test/
       run-pass/
-      compile-fail/
       debuginfo/
       ...
 

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -372,7 +372,6 @@ impl<'a> Builder<'a> {
                 test::Tidy,
                 test::Ui,
                 test::RunPass,
-                test::CompileFail,
                 test::RunFail,
                 test::RunPassValgrind,
                 test::MirOpt,

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -828,12 +828,6 @@ default_test_with_compare_mode!(RunPass {
     compare_mode: "nll"
 });
 
-default_test!(CompileFail {
-    path: "src/test/compile-fail",
-    mode: "compile-fail",
-    suite: "compile-fail"
-});
-
 default_test!(RunFail {
     path: "src/test/run-fail",
     mode: "run-fail",

diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
@@ -10,7 +10,6 @@ use crate::util::PathBufExt;
 
 #[derive(Clone, Copy, PartialEq, Debug)]
 pub enum Mode {
-    CompileFail,
     RunFail,
     /// This now behaves like a `ui` test that has an implict `// run-pass`.
     RunPass,
@@ -50,7 +49,6 @@ impl FromStr for Mode {
     type Err = ();
     fn from_str(s: &str) -> Result<Mode, ()> {
         match s {
-            "compile-fail" => Ok(CompileFail),
             "run-fail" => Ok(RunFail),
             "run-pass" => Ok(RunPass),
             "run-pass-valgrind" => Ok(RunPassValgrind),
@@ -76,7 +74,6 @@ impl FromStr for Mode {
 impl fmt::Display for Mode {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let s = match *self {
-            CompileFail => "compile-fail",
             RunFail => "run-fail",
             RunPass => "run-pass",
             RunPassValgrind => "run-pass-valgrind",
@@ -172,7 +169,7 @@ pub struct Config {
     /// The name of the stage being built (stage1, etc)
     pub stage_id: String,
 
-    /// The test mode, compile-fail, run-fail, run-pass
+    /// The test mode, run-fail, run-pass
     pub mode: Mode,
 
     /// Run ignored tests

diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
@@ -125,7 +125,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
             "",
             "mode",
             "which sort of compile tests to run",
-            "(compile-fail|run-fail|run-pass|\
+            "(run-fail|run-pass|\
              run-pass-valgrind|pretty|debug-info|incremental|mir-opt)",
         )
         .optflag("", "ignored", "run tests marked as ignored")

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -5,7 +5,7 @@ use crate::common::{expected_output_path, UI_EXTENSIONS, UI_FIXED, UI_STDERR, UI
 use crate::common::{output_base_dir, output_base_name, output_testname_unique};
 use crate::common::{Codegen, CodegenUnits, Rustdoc};
 use crate::common::{DebugInfoCdb, DebugInfoGdbLldb, DebugInfoGdb, DebugInfoLldb};
-use crate::common::{CompileFail, Pretty, RunFail, RunPass, RunPassValgrind};
+use crate::common::{Pretty, RunFail, RunPass, RunPassValgrind};
 use crate::common::{Config, TestPaths};
 use crate::common::{Incremental, MirOpt, RunMake, Ui, JsDocTest, Assembly};
 use diff;
@@ -286,7 +286,6 @@ impl<'test> TestCx<'test> {
     /// revisions, exactly once, with revision == None).
     fn run_revision(&self) {
         match self.config.mode {
-            CompileFail => self.run_cfail_test(),
             RunFail => self.run_rfail_test(),
             RunPassValgrind => self.run_valgrind_test(),
             Pretty => self.run_pretty_test(),
@@ -319,7 +318,6 @@ impl<'test> TestCx<'test> {
 
     fn should_compile_successfully(&self) -> bool {
         match self.config.mode {
-            CompileFail => false,
             RunPass => true,
             JsDocTest => true,
             Ui => self.props.pass_mode.is_some(),
@@ -1535,12 +1533,11 @@ impl<'test> TestCx<'test> {
         rustc.arg("-L").arg(&self.aux_output_dir_name());
 
         match self.config.mode {
-            CompileFail | Ui => {
-                // compile-fail and ui tests tend to have tons of unused code as
-                // it's just testing various pieces of the compile, but we don't
-                // want to actually assert warnings about all this code. Instead
-                // let's just ignore unused code warnings by defaults and tests
-                // can turn it back on if needed.
+            Ui => {
+                // ui tests tend to have tons of unused code as it's just testing
+                // various pieces of the compile, but we don't want to actually assert
+                // warnings about all this code. Instead let's just ignore unused
+                // code warnings by defaults and tests can turn it back on if needed.
                 if !self.config.src_base.ends_with("rustdoc-ui") {
                     rustc.args(&["-A", "unused"]);
                 }
@@ -1922,7 +1919,7 @@ impl<'test> TestCx<'test> {
         }
 
         match self.config.mode {
-            CompileFail | Incremental => {
+            Incremental => {
                 // If we are extracting and matching errors in the new
                 // fashion, then you want JSON mode. Old-skool error
                 // patterns still match the raw compiler output.