Add support for --test-args to cargotest

This allows running a single test without having to wait for all tests
to complete.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 965d1162145..814a591b137 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -183,6 +183,7 @@ impl Step for Cargotest {
             builder,
             cmd.arg(&cargo)
                 .arg(&out_dir)
+                .args(builder.config.cmd.test_args())
                 .env("RUSTC", builder.rustc(compiler))
                 .env("RUSTDOC", builder.rustdoc(compiler)),
         );
diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs
index fc608eaabcc..54ff38e39db 100644
--- a/src/tools/cargotest/main.rs
+++ b/src/tools/cargotest/main.rs
@@ -85,7 +85,9 @@ fn main() {
     let cargo = &Path::new(cargo);
 
     for test in TEST_REPOS.iter().rev() {
-        test_repo(cargo, out_dir, test);
+        if args[3..].is_empty() || args[3..].iter().any(|s| s.contains(test.name)) {
+            test_repo(cargo, out_dir, test);
+        }
     }
 }