bootstrap: pass --filter-mode on to compiletest.

Author: Centril

src/bootstrap/builder.rs

@@ -1932,6 +1932,7 @@ mod __test {
             bless: false,
             compare_mode: None,
             rustfix_coverage: false,
+            filter_mode: None,
         };
 
         let build = Build::new(config);
@@ -1974,6 +1975,7 @@ mod __test {
             bless: false,
             compare_mode: None,
             rustfix_coverage: false,
+            filter_mode: None,
         };
 
         let build = Build::new(config);

src/bootstrap/flags.rs

@@ -58,6 +58,7 @@ pub enum Subcommand {
         /// Whether to automatically update stderr/stdout files
         bless: bool,
         compare_mode: Option<String>,
+        filter_mode: Option<String>,
         test_args: Vec<String>,
         rustc_args: Vec<String>,
         fail_fast: bool,
@@ -199,6 +200,12 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`"
                     "mode describing what file the actual ui output will be compared to",
                     "COMPARE MODE",
                 );
+                opts.optopt(
+                    "",
+                    "filter-mode",
+                    "only test files matching any of the comma separated list of modes",
+                    "MODES",
+                );
                 opts.optflag(
                     "",
                     "rustfix-coverage",
@@ -401,6 +408,7 @@ Arguments:
                 paths,
                 bless: matches.opt_present("bless"),
                 compare_mode: matches.opt_str("compare-mode"),
+                filter_mode: matches.opt_str("filter-mode"),
                 test_args: matches.opt_strs("test-args"),
                 rustc_args: matches.opt_strs("rustc-args"),
                 fail_fast: !matches.opt_present("no-fail-fast"),
@@ -524,6 +532,15 @@ impl Subcommand {
             _ => None,
         }
     }
+
+    pub fn filter_mode(&self) -> Option<&str> {
+        match *self {
+            Subcommand::Test {
+                ref filter_mode, ..
+            } => filter_mode.as_ref().map(|s| &s[..]),
+            _ => None,
+        }
+    }
 }
 
 fn split(s: &[String]) -> Vec<String> {

src/bootstrap/test.rs

@@ -1065,6 +1065,11 @@ impl Step for Compiletest {
             }
         });
 
+        if let Some(ref filter_mode) = builder.config.cmd.filter_mode() {
+            cmd.arg("--filter-mode");
+            cmd.arg(filter_mode);
+        }
+
         if let Some(ref nodejs) = builder.config.nodejs {
             cmd.arg("--nodejs").arg(nodejs);
         }