about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-08-13 09:52:49 -0700
committerGitHub <noreply@github.com>2016-08-13 09:52:49 -0700
commit2b7ea14cc492fa010f8a914044faebd6c27333ab (patch)
treec2bbadee72b041e075bd45645c3acd20fea27a22 /src/tools
parente64f68817d850ccbe642d7f067083bc655115d84 (diff)
parent6ca90942e744f79982a9b485e2367b0ecee14527 (diff)
downloadrust-2b7ea14cc492fa010f8a914044faebd6c27333ab.tar.gz
rust-2b7ea14cc492fa010f8a914044faebd6c27333ab.zip
Auto merge of #35414 - jupp0r:feature/test-threads-flag, r=alexcrichton
Add --test-threads option to test binaries

This change allows parallelism of test runs to be specified by a
command line flag names --test-threads in addition to the existing
environment variable RUST_TEST_THREADS. Fixes #25636.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/compiletest/src/main.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index cefcc11486f..90641b5c476 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -310,6 +310,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
             Err(_) => false
         },
         color: test::AutoColor,
+        test_threads: None,
     }
 }