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

Run test commands in the provided order

Browse Source
This commit is contained in:
Guillaume Gomez 2024-03-21 17:09:37 +01:00
parent cde105a651
commit 52f6d5d589
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build_system/src/test.rs
View File

@ -6,7 +6,7 @@
split_args, walk_dir, split_args, walk_dir,
}; };
use std::collections::{BTreeSet, HashMap}; use std::collections::HashMap;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fs::{remove_dir_all, File}; use std::fs::{remove_dir_all, File};
use std::io::{BufRead, BufReader}; use std::io::{BufRead, BufReader};
@ -82,7 +82,7 @@ fn show_usage() {
struct TestArg { struct TestArg {
build_only: bool, build_only: bool,
use_system_gcc: bool, use_system_gcc: bool,
runners: BTreeSet<String>, runners: Vec<String>,
flags: Vec<String>, flags: Vec<String>,
nb_parts: Option<usize>, nb_parts: Option<usize>,
current_part: Option<usize>, current_part: Option<usize>,
@ -127,8 +127,8 @@ fn new() -> Result<Option<Self>, String> {
show_usage(); show_usage();
return Ok(None); return Ok(None);
} }
x if runners.contains_key(x) => { x if runners.contains_key(x) && !test_arg.runners.iter().any(|runner| runner == x) => {
test_arg.runners.insert(x.into()); test_arg.runners.push(x.into());
} }
arg => { arg => {
if !test_arg.config_info.parse_argument(arg, &mut args)? { if !test_arg.config_info.parse_argument(arg, &mut args)? {
@ -535,7 +535,7 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
let rustc_args = &format!( let rustc_args = &format!(
r#"-Zpanic-abort-tests \ r#"-Zpanic-abort-tests \
-Zcodegen-backend="{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}" \ -Zcodegen-backend="{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}" \
--sysroot "{pwd}/{sysroot_dir}" -Cpanic=abort{extra}"#, --sysroot "{sysroot_dir}" -Cpanic=abort{extra}"#,
pwd = std::env::current_dir() pwd = std::env::current_dir()
.map_err(|error| format!("`current_dir` failed: {:?}", error))? .map_err(|error| format!("`current_dir` failed: {:?}", error))?
.display(), .display(),
@ -974,11 +974,11 @@ fn file_handling(file_path: &Path) -> Result<(), String> {
if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" }; if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
let rustc_args = format!( let rustc_args = format!(
"{} -Zcodegen-backend={} --sysroot {}{}", "{test_flags} -Zcodegen-backend={backend} --sysroot {sysroot}{extra}",
env.get("TEST_FLAGS").unwrap_or(&String::new()), test_flags = env.get("TEST_FLAGS").unwrap_or(&String::new()),
args.config_info.cg_backend_path, backend = args.config_info.cg_backend_path,
args.config_info.sysroot_path, sysroot = args.config_info.sysroot_path,
extra, extra = extra,
); );
env.get_mut("RUSTFLAGS").unwrap().clear(); env.get_mut("RUSTFLAGS").unwrap().clear();