Skip to content

Commit 8e870c7

Browse files
Remove unused TestArgs::use_backend and display messages in case a test is not run
1 parent 6e53832 commit 8e870c7

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

build_system/src/test.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ fn show_usage() {
9797
);
9898
ConfigInfo::show_usage();
9999
for (option, (doc, _)) in get_runners() {
100+
// FIXME: Instead of using the hard-coded `23` value, better to compute it instead.
100101
let needed_spaces = 23_usize.saturating_sub(option.len());
101102
let spaces: String = std::iter::repeat(' ').take(needed_spaces).collect();
102103
println!(" {}{}: {}", option, spaces, doc);
@@ -109,7 +110,6 @@ struct TestArg {
109110
no_default_features: bool,
110111
build_only: bool,
111112
gcc_path: String,
112-
use_backend: bool,
113113
runners: BTreeSet<String>,
114114
flags: Vec<String>,
115115
backend: Option<String>,
@@ -207,7 +207,7 @@ impl TestArg {
207207
}
208208

209209
fn build_if_no_backend(env: &Env, args: &TestArg) -> Result<(), String> {
210-
if args.use_backend {
210+
if args.backend.is_some() {
211211
return Ok(());
212212
}
213213
let mut command: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &"rustc"];
@@ -504,8 +504,6 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<(), String> {
504504
None => return Err("Couldn't retrieve rustc commit hash".to_string()),
505505
};
506506
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());
509507
let cargo = String::from_utf8(
510508
run_command_with_env(&[&"rustup", &"which", &"cargo"], rust_dir, Some(env))?.stdout,
511509
)
@@ -684,6 +682,7 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
684682

685683
fn extended_rand_tests(env: &Env, args: &TestArg) -> Result<(), String> {
686684
if !args.is_using_gcc_master_branch() {
685+
println!("Not using GCC master branch. Skipping `extended_rand_tests`.");
687686
return Ok(());
688687
}
689688
let path = Path::new("rand");
@@ -696,6 +695,7 @@ fn extended_rand_tests(env: &Env, args: &TestArg) -> Result<(), String> {
696695

697696
fn extended_regex_example_tests(env: &Env, args: &TestArg) -> Result<(), String> {
698697
if !args.is_using_gcc_master_branch() {
698+
println!("Not using GCC master branch. Skipping `extended_regex_example_tests`.");
699699
return Ok(());
700700
}
701701
let path = Path::new("regex");
@@ -750,6 +750,7 @@ fn extended_regex_example_tests(env: &Env, args: &TestArg) -> Result<(), String>
750750

751751
fn extended_regex_tests(env: &Env, args: &TestArg) -> Result<(), String> {
752752
if !args.is_using_gcc_master_branch() {
753+
println!("Not using GCC master branch. Skipping `extended_regex_tests`.");
753754
return Ok(());
754755
}
755756
// FIXME: create a function "display_if_not_quiet" or something along the line.

0 commit comments

Comments
 (0)