bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Minor changes to the TestRunner::new signature

Browse source
This commit is contained in:
bjorn3 2023-01-14 12:44:39 +00:00
parent 5e452ba616
commit fd1e824d88
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
build_system/tests.rs
View file

@ -243,8 +243,11 @@ pub(crate) fn run_tests(
host_compiler: &Compiler, host_compiler: &Compiler,
target_triple: &str, target_triple: &str,
) { ) {
let runner = let runner = TestRunner::new(
TestRunner::new(dirs.clone(), host_compiler.triple.clone(), target_triple.to_string()); dirs.clone(),
target_triple.to_owned(),
host_compiler.triple == target_triple,
);
if config::get_bool("testsuite.no_sysroot") { if config::get_bool("testsuite.no_sysroot") {
build_sysroot::build_sysroot( build_sysroot::build_sysroot(
@ -297,11 +300,7 @@ struct TestRunner {
} }
impl TestRunner { impl TestRunner {
pub fn new(dirs: Dirs, host_triple: String, target_triple: String) -> Self { pub fn new(dirs: Dirs, target_triple: String, is_native: bool) -> Self {
let is_native = host_triple == target_triple;
let jit_supported =
is_native && host_triple.contains("x86_64") && !host_triple.contains("windows");
let mut target_compiler = Compiler::clif_with_triple(&dirs, target_triple); let mut target_compiler = Compiler::clif_with_triple(&dirs, target_triple);
if !is_native { if !is_native {
target_compiler.set_cross_linker_and_runner(); target_compiler.set_cross_linker_and_runner();
@ -320,6 +319,10 @@ impl TestRunner {
target_compiler.rustflags.push_str(" -Clink-arg=-undefined -Clink-arg=dynamic_lookup"); target_compiler.rustflags.push_str(" -Clink-arg=-undefined -Clink-arg=dynamic_lookup");
} }
let jit_supported = is_native
&& target_compiler.triple.contains("x86_64")
&& !target_compiler.triple.contains("windows");
Self { is_native, jit_supported, dirs, target_compiler } Self { is_native, jit_supported, dirs, target_compiler }
} }