about summary refs log tree commit diff
path: root/man
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 /man
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 'man')
-rw-r--r--man/rustc.13
1 files changed, 2 insertions, 1 deletions
diff --git a/man/rustc.1 b/man/rustc.1
index edbc6cea026..0eaf89a560f 100644
--- a/man/rustc.1
+++ b/man/rustc.1
@@ -264,7 +264,8 @@ which link to the standard library.
 .TP
 \fBRUST_TEST_THREADS\fR
 The test framework Rust provides executes tests in parallel. This variable sets
-the maximum number of threads used for this purpose.
+the maximum number of threads used for this purpose. This setting is overridden
+by the --test-threads option.
 
 .TP
 \fBRUST_TEST_NOCAPTURE\fR