mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly pass cfg option

Browse Source
This commit is contained in:
Guillaume Gomez 2023-11-23 16:09:11 +01:00
parent 673661db8b
commit d793f80bd4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build_system/src/test.rs
View File

@ -390,7 +390,7 @@ fn std_tests(env: &Env, args: &TestArg) -> Result<(), String> {
&args.config_info.target_triple, &args.config_info.target_triple,
]); ]);
if !args.no_default_features { if !args.no_default_features {
command.push(&"--cfg feature=\"master\""); command.extend_from_slice(&[&"--cfg", &"feature=\"master\""]);
} }
run_command_with_env(&command, None, Some(env))?; run_command_with_env(&command, None, Some(env))?;
@ -454,7 +454,7 @@ fn std_tests(env: &Env, args: &TestArg) -> Result<(), String> {
&args.config_info.target_triple, &args.config_info.target_triple,
]); ]);
if !args.no_default_features { if !args.no_default_features {
command.push(&"--cfg feature=\"master\""); command.extend_from_slice(&[&"--cfg", &"feature=\"master\""]);
} }
run_command_with_env(&command, None, Some(env))?; run_command_with_env(&command, None, Some(env))?;
run_command_in_vm( run_command_in_vm(
@ -1085,8 +1085,9 @@ fn test_successful_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
.filter(|line| !line.is_empty()) .filter(|line| !line.is_empty())
{ {
let path = Path::new("rust").join(file); let path = Path::new("rust").join(file);
std::fs::remove_file(&path) std::fs::remove_file(&path).map_err(|error| {
.map_err(|error| format!("failed to remove `{}`: {:?}", path.display(), error))?; format!("failed to remove `{}`: {:?}", path.display(), error)
})?;
} }
} else { } else {
println!( println!(