about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorAlexander Battisti <battisti@gmail.com>2017-01-09 20:20:11 +0100
committerAlexander Battisti <battisti@gmail.com>2017-01-09 20:20:11 +0100
commit61206c4293fdf256a0971d2effd87e5a874afbd7 (patch)
tree9cd4fd13c81bf1da6dbcdcf3db246e920fae55a6 /src/libtest
parentbd16aa08cdfb89982e3ed2820454769321803c61 (diff)
downloadrust-61206c4293fdf256a0971d2effd87e5a874afbd7.tar.gz
rust-61206c4293fdf256a0971d2effd87e5a874afbd7.zip
Fix for for setting test-threads to 0
Running test with cargo test -- --test-threads=0 causes cargo to
hang as 0 is a valid usize. Adding zero threads as a special case
to the error handling.
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 30c34746c34..568e86225a3 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -439,6 +439,8 @@ pub fn parse_opts(args: &[String]) -> Option<OptRes> {
     let test_threads = match matches.opt_str("test-threads") {
         Some(n_str) =>
             match n_str.parse::<usize>() {
+                Ok(0) => 
+                    return Some(Err(format!("argument for --test-threads must not be 0"))),
                 Ok(n) => Some(n),
                 Err(e) =>
                     return Some(Err(format!("argument for --test-threads must be a number > 0 \