@@ -97,6 +97,7 @@ fn show_usage() {
97
97
) ;
98
98
ConfigInfo :: show_usage ( ) ;
99
99
for ( option, ( doc, _) ) in get_runners ( ) {
100
+ // FIXME: Instead of using the hard-coded `23` value, better to compute it instead.
100
101
let needed_spaces = 23_usize . saturating_sub ( option. len ( ) ) ;
101
102
let spaces: String = std:: iter:: repeat ( ' ' ) . take ( needed_spaces) . collect ( ) ;
102
103
println ! ( " {}{}: {}" , option, spaces, doc) ;
@@ -109,7 +110,6 @@ struct TestArg {
109
110
no_default_features : bool ,
110
111
build_only : bool ,
111
112
gcc_path : String ,
112
- use_backend : bool ,
113
113
runners : BTreeSet < String > ,
114
114
flags : Vec < String > ,
115
115
backend : Option < String > ,
@@ -207,7 +207,7 @@ impl TestArg {
207
207
}
208
208
209
209
fn build_if_no_backend ( env : & Env , args : & TestArg ) -> Result < ( ) , String > {
210
- if args. use_backend {
210
+ if args. backend . is_some ( ) {
211
211
return Ok ( ( ) ) ;
212
212
}
213
213
let mut command: Vec < & dyn AsRef < OsStr > > = vec ! [ & "cargo" , & "rustc" ] ;
@@ -504,8 +504,6 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<(), String> {
504
504
None => return Err ( "Couldn't retrieve rustc commit hash" . to_string ( ) ) ,
505
505
} ;
506
506
run_command_with_output_and_env ( & [ & "git" , & "checkout" , & rustc_commit] , rust_dir, Some ( env) ) ?;
507
- // FIXME: Is it really needed to empty `RUSTFLAGS` here?
508
- // env.insert("RUSTFLAGS".to_string(), String::new());
509
507
let cargo = String :: from_utf8 (
510
508
run_command_with_env ( & [ & "rustup" , & "which" , & "cargo" ] , rust_dir, Some ( env) ) ?. stdout ,
511
509
)
@@ -684,6 +682,7 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
684
682
685
683
fn extended_rand_tests ( env : & Env , args : & TestArg ) -> Result < ( ) , String > {
686
684
if !args. is_using_gcc_master_branch ( ) {
685
+ println ! ( "Not using GCC master branch. Skipping `extended_rand_tests`." ) ;
687
686
return Ok ( ( ) ) ;
688
687
}
689
688
let path = Path :: new ( "rand" ) ;
@@ -696,6 +695,7 @@ fn extended_rand_tests(env: &Env, args: &TestArg) -> Result<(), String> {
696
695
697
696
fn extended_regex_example_tests ( env : & Env , args : & TestArg ) -> Result < ( ) , String > {
698
697
if !args. is_using_gcc_master_branch ( ) {
698
+ println ! ( "Not using GCC master branch. Skipping `extended_regex_example_tests`." ) ;
699
699
return Ok ( ( ) ) ;
700
700
}
701
701
let path = Path :: new ( "regex" ) ;
@@ -750,6 +750,7 @@ fn extended_regex_example_tests(env: &Env, args: &TestArg) -> Result<(), String>
750
750
751
751
fn extended_regex_tests ( env : & Env , args : & TestArg ) -> Result < ( ) , String > {
752
752
if !args. is_using_gcc_master_branch ( ) {
753
+ println ! ( "Not using GCC master branch. Skipping `extended_regex_tests`." ) ;
753
754
return Ok ( ( ) ) ;
754
755
}
755
756
// FIXME: create a function "display_if_not_quiet" or something along the line.
0 commit comments