@@ -77,6 +77,10 @@ pub fn parse_config(args: Vec<String> ) -> Config {
7777 optopt( "" , "target-rustcflags" , "flags to pass to rustc for target" , "FLAGS" ) ,
7878 optflag( "" , "verbose" , "run tests verbosely, showing all output" ) ,
7979 optopt( "" , "logfile" , "file to log test execution to" , "FILE" ) ,
80+ optopt( "" , "save-metrics" , "file to save metrics to" , "FILE" ) ,
81+ optopt( "" , "ratchet-metrics" , "file to ratchet metrics against" , "FILE" ) ,
82+ optopt( "" , "ratchet-noise-percent" ,
83+ "percent change in metrics to consider noise" , "N" ) ,
8084 optflag( "" , "jit" , "run tests under the JIT" ) ,
8185 optopt( "" , "target" , "the target to build for" , "TARGET" ) ,
8286 optopt( "" , "host" , "the host to build for" , "HOST" ) ,
@@ -86,6 +90,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
8690 optopt( "" , "adb-path" , "path to the android debugger" , "PATH" ) ,
8791 optopt( "" , "adb-test-dir" , "path to tests for the android debugger" , "PATH" ) ,
8892 optopt( "" , "lldb-python-dir" , "directory containing LLDB's python module" , "PATH" ) ,
93+ optopt( "" , "test-shard" , "run shard A, of B shards, worth of the testsuite" , "A.B" ) ,
8994 optflag( "h" , "help" , "show this message" ) ) ;
9095
9196 assert ! ( !args. is_empty( ) ) ;
@@ -147,6 +152,12 @@ pub fn parse_config(args: Vec<String> ) -> Config {
147152 filter : filter,
148153 cfail_regex : Regex :: new ( errors:: EXPECTED_PATTERN ) . unwrap ( ) ,
149154 logfile : matches. opt_str ( "logfile" ) . map ( |s| Path :: new ( s) ) ,
155+ save_metrics : matches. opt_str ( "save-metrics" ) . map ( |s| Path :: new ( s) ) ,
156+ ratchet_metrics :
157+ matches. opt_str ( "ratchet-metrics" ) . map ( |s| Path :: new ( s) ) ,
158+ ratchet_noise_percent :
159+ matches. opt_str ( "ratchet-noise-percent" )
160+ . and_then ( |s| s. as_slice ( ) . parse :: < f64 > ( ) ) ,
150161 runtool : matches. opt_str ( "runtool" ) ,
151162 host_rustcflags : matches. opt_str ( "host-rustcflags" ) ,
152163 target_rustcflags : matches. opt_str ( "target-rustcflags" ) ,
@@ -165,6 +176,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
165176 opt_str2 ( matches. opt_str ( "adb-test-dir" ) ) . as_slice ( ) &&
166177 !opt_str2 ( matches. opt_str ( "adb-test-dir" ) ) . is_empty ( ) ,
167178 lldb_python_dir : matches. opt_str ( "lldb-python-dir" ) ,
179+ test_shard : test:: opt_shard ( matches. opt_str ( "test-shard" ) ) ,
168180 verbose : matches. opt_present ( "verbose" ) ,
169181 }
170182}
@@ -198,6 +210,10 @@ pub fn log_config(config: &Config) {
198210 logv ( c, format ! ( "adb_test_dir: {:?}" , config. adb_test_dir) ) ;
199211 logv ( c, format ! ( "adb_device_status: {}" ,
200212 config. adb_device_status) ) ;
213+ match config. test_shard {
214+ None => logv ( c, "test_shard: (all)" . to_string ( ) ) ,
215+ Some ( ( a, b) ) => logv ( c, format ! ( "test_shard: {}.{}" , a, b) )
216+ }
201217 logv ( c, format ! ( "verbose: {}" , config. verbose) ) ;
202218 logv ( c, format ! ( "\n " ) ) ;
203219}
@@ -268,8 +284,15 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
268284 logfile : config. logfile . clone ( ) ,
269285 run_tests : true ,
270286 run_benchmarks : true ,
287+ ratchet_metrics : config. ratchet_metrics . clone ( ) ,
288+ ratchet_noise_percent : config. ratchet_noise_percent . clone ( ) ,
289+ save_metrics : config. save_metrics . clone ( ) ,
290+ test_shard : config. test_shard . clone ( ) ,
271291 nocapture : false ,
272292 color : test:: AutoColor ,
293+ show_boxplot : false ,
294+ boxplot_width : 50 ,
295+ show_all_stats : false ,
273296 }
274297}
275298
0 commit comments