about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <andersrb@gmail.com>2012-06-03 15:02:16 -0700
committerBrian Anderson <andersrb@gmail.com>2012-06-03 15:02:16 -0700
commit9826541c0e5c1df9000bd9811215857249cd0376 (patch)
treec8fc4187a257b523ebb092b92f83090798aa3b35
parent0ecf20c99a43d0d258b08ebbd62526b69f013794 (diff)
parent3c4a1ab0c4eed8c7511454ed16bdee6cd988c47a (diff)
Merge pull request #2492 from tedhorst/mandelbrot_args
fix args to shootout-mandelbrot benchmark
-rw-r--r--src/test/bench/shootout-mandelbrot.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs
index c48e229e4d2..5daa87fcf11 100644
--- a/src/test/bench/shootout-mandelbrot.rs
+++ b/src/test/bench/shootout-mandelbrot.rs
@@ -141,19 +141,20 @@ fn writer(path: str, writech: comm::chan<comm::chan<line>>, size: uint)
 }
 
 fn main(args: [str]) {
-    let path = if vec::len(args) < 4_u { "" }
-    else { args[3] };
-
     let args = if os::getenv("RUST_BENCH").is_some() {
         ["", "4000", "10"]
-    } else if args.len() <= 1u {
-        ["", "80", "10"]
     } else {
         args
     };
 
-    let size = uint::from_str(args[1]).get();
-    let yieldevery = uint::from_str(args[2]).get();
+    let path = if vec::len(args) < 4_u { "" }
+    else { args[3] };
+
+    let yieldevery = if vec::len(args) < 3_u { 10_u }
+    else { uint::from_str(args[2]).get() };
+
+    let size = if vec::len(args) < 2_u { 80_u }
+    else { uint::from_str(args[1]).get() };
 
     let writep = comm::port();
     let writech = comm::chan(writep);