From 6ca90942e744f79982a9b485e2367b0ecee14527 Mon Sep 17 00:00:00 2001
From: Jupp Müller <jupp0r@gmail.com>
Date: Sat, 6 Aug 2016 09:01:12 +0200
Subject: 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.
---
 man/rustc.1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'man')

diff --git a/man/rustc.1 b/man/rustc.1
index fa61afd3be5..95650255c5d 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
-- 
cgit 1.4.1-3-g733a5