@@ -449,15 +449,8 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
449
449
pub fn make_tests ( config : & Config , tests : & mut Vec < test:: TestDescAndFn > ) {
450
450
debug ! ( "making tests from {:?}" , config. src_base. display( ) ) ;
451
451
let inputs = common_inputs_stamp ( config) ;
452
- collect_tests_from_dir (
453
- config,
454
- & config. src_base ,
455
- & config. src_base ,
456
- & PathBuf :: new ( ) ,
457
- & inputs,
458
- tests,
459
- )
460
- . expect ( & format ! ( "Could not read tests from {}" , config. src_base. display( ) ) ) ;
452
+ collect_tests_from_dir ( config, & config. src_base , & PathBuf :: new ( ) , & inputs, tests)
453
+ . expect ( & format ! ( "Could not read tests from {}" , config. src_base. display( ) ) ) ;
461
454
}
462
455
463
456
/// Returns a stamp constructed from input files common to all test cases.
@@ -494,7 +487,6 @@ fn common_inputs_stamp(config: &Config) -> Stamp {
494
487
495
488
fn collect_tests_from_dir (
496
489
config : & Config ,
497
- base : & Path ,
498
490
dir : & Path ,
499
491
relative_dir_path : & Path ,
500
492
inputs : & Stamp ,
@@ -538,14 +530,7 @@ fn collect_tests_from_dir(
538
530
let relative_file_path = relative_dir_path. join ( file. file_name ( ) ) ;
539
531
if & file_name != "auxiliary" {
540
532
debug ! ( "found directory: {:?}" , file_path. display( ) ) ;
541
- collect_tests_from_dir (
542
- config,
543
- base,
544
- & file_path,
545
- & relative_file_path,
546
- inputs,
547
- tests,
548
- ) ?;
533
+ collect_tests_from_dir ( config, & file_path, & relative_file_path, inputs, tests) ?;
549
534
}
550
535
} else {
551
536
debug ! ( "found other file/directory: {:?}" , file_path. display( ) ) ;
0 commit comments