about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-01-13 16:44:17 +0900
committerGitHub <noreply@github.com>2020-01-13 16:44:17 +0900
commit7d3fa2963321dcc9f6402f325e5daf92fbb9d5a8 (patch)
tree4e6c2bdd677e79e39177df1078063108892098a8
parentbc031e30fa7cfc05f21e576bc121f8d3fda9ac1b (diff)
parent91e9531ed1a70eab0c4f6a6bce304e2a731f54e7 (diff)
downloadrust-7d3fa2963321dcc9f6402f325e5daf92fbb9d5a8.tar.gz
rust-7d3fa2963321dcc9f6402f325e5daf92fbb9d5a8.zip
Rollup merge of #68097 - MikailBag:master, r=shepmaster
Specify units for test timeout environment variables

I think it is not obvious (I got it from reading libtest sources), so it is worth mentioning in docs.
-rw-r--r--src/libtest/cli.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libtest/cli.rs b/src/libtest/cli.rs
index ea6d632f48a..edff8bea0f3 100644
--- a/src/libtest/cli.rs
+++ b/src/libtest/cli.rs
@@ -125,6 +125,8 @@ fn optgroups() -> getopts::Options {
             `RUST_TEST_TIME_DOCTEST` environment variables.
 
             Expected format of environment variable is `VARIABLE=WARN_TIME,CRITICAL_TIME`.
+            Durations must be specified in milliseconds, e.g. `500,2000` means that the warn time
+            is 0.5 seconds, and the critical time is 2 seconds.
 
             Not available for --format=terse",
             "plain|colored",