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

Misc cleanups to the test runner

Browse Source
This commit is contained in:
Afonso Bordado 2022-07-30 12:50:05 +01:00
parent c115933fb7
commit d0599350a7
3 changed files with 50 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_system/build_backend.rs
View File

@ -1,11 +1,12 @@
use std::env;
use std::path::{Path, PathBuf};
use std::process::Command;
pub(crate) fn build_backend(
channel: &str,
host_triple: &str,
use_unstable_features: bool,
) {
) -> PathBuf {
let mut cmd = Command::new("cargo");
cmd.arg("build").arg("--target").arg(host_triple);
@ -37,4 +38,6 @@ pub(crate) fn build_backend(
eprintln!("[BUILD] rustc_codegen_cranelift");
super::utils::spawn_and_wait(cmd);
Path::new("target").join(&host_triple).join(&channel)
}

15
build_system/mod.rs
View File

@ -1,5 +1,5 @@
use std::env;
use std::path::{PathBuf, Path};
use std::path::PathBuf;
use std::process;
mod build_backend;
@ -122,10 +122,10 @@ pub fn main() {
process::exit(1);
}
let cg_clif_build_dir = Path::new("target").join(&host_triple).join(&channel);
let cg_clif_build_dir = build_backend::build_backend(channel, &host_triple, use_unstable_features);
if command == Command::Test {
// TODO: Should we also build_backend here?
match command {
Command::Test => {
tests::run_tests(
channel,
sysroot_kind,
@ -133,9 +133,9 @@ pub fn main() {
&cg_clif_build_dir,
&host_triple,
&target_triple,
).expect("Failed to run tests");
} else {
build_backend::build_backend(channel, &host_triple, use_unstable_features);
);
},
Command::Build => {
build_sysroot::build_sysroot(
channel,
sysroot_kind,
@ -145,4 +145,5 @@ pub fn main() {
&target_triple,
);
}
}
}

59
build_system/tests.rs
View File

@ -8,8 +8,6 @@
use std::path::{Path, PathBuf};
use std::process::Command;
type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
struct TestCase {
config: &'static str,
func: &'static dyn Fn(&TestRunner),
@ -183,18 +181,16 @@ const fn new(config: &'static str, func: &'static dyn Fn(&TestRunner)) -> Self {
runner.run_cargo(["clean"]);
// newer aho_corasick versions throw a deprecation warning
let mut lint_rust_flags = runner.rust_flags.clone();
lint_rust_flags.push("--cap-lints".to_string());
lint_rust_flags.push("warn".to_string());
let lint_rust_flags = format!("{} --cap-lints warn", runner.rust_flags);
let mut build_cmd = runner.cargo_command(["build", "--example", "shootout-regex-dna", "--target", &runner.target_triple]);
build_cmd.env("RUSTFLAGS", lint_rust_flags.join(" "));
build_cmd.env("RUSTFLAGS", lint_rust_flags.clone());
spawn_and_wait(build_cmd);
if runner.host_triple == runner.target_triple {
let mut run_cmd = runner.cargo_command(["run", "--example", "shootout-regex-dna", "--target", &runner.target_triple]);
run_cmd.env("RUSTFLAGS", lint_rust_flags.join(" "));
run_cmd.env("RUSTFLAGS", lint_rust_flags);
let input = fs::read_to_string(PathBuf::from("examples/regexdna-input.txt")).unwrap();
@ -205,7 +201,6 @@ const fn new(config: &'static str, func: &'static dyn Fn(&TestRunner)) -> Self {
// Make sure `[codegen mono items] start` doesn't poison the diff
let output = output.lines()
.filter(|line| !line.contains("codegen mono items"))
.filter(|line| !line.contains("Spawned thread"))
.chain(Some("")) // This just adds the trailing newline
.collect::<Vec<&str>>()
.join("\r\n");
@ -267,7 +262,7 @@ pub(crate) fn run_tests(
cg_clif_build_dir: &Path,
host_triple: &str,
target_triple: &str,
) -> Result<()> {
) {
let runner = TestRunner::new(host_triple.to_string(), target_triple.to_string());
if config::get_bool("testsuite.no_sysroot") {
@ -280,7 +275,7 @@ pub(crate) fn run_tests(
&target_triple,
);
let _ = remove_out_dir();
let _ = fs::remove_dir_all(Path::new("target").join("out"));
runner.run_testsuite(NO_SYSROOT_SUITE);
} else {
eprintln!("[SKIP] no_sysroot tests");
@ -311,22 +306,16 @@ pub(crate) fn run_tests(
} else {
eprintln!("[SKIP] extended_sysroot tests");
}
Ok(())
}
fn remove_out_dir() -> Result<()> {
let out_dir = Path::new("target").join("out");
Ok(fs::remove_dir_all(out_dir)?)
}
struct TestRunner {
root_dir: PathBuf,
out_dir: PathBuf,
jit_supported: bool,
rust_flags: Vec<String>,
run_wrapper: Vec<String>,
rust_flags: String,
run_wrapper: String,
host_triple: String,
target_triple: String,
}
@ -342,22 +331,19 @@ pub fn new(host_triple: String, target_triple: String) -> Self {
let is_native = host_triple == target_triple;
let jit_supported = target_triple.contains("x86_64") && is_native;
let env_rust_flags = env::var("RUSTFLAGS").ok();
let env_run_wrapper = env::var("RUN_WRAPPER").ok();
let mut rust_flags: Vec<&str> = env_rust_flags.iter().map(|s| s.as_str()).collect();
let mut run_wrapper: Vec<&str> = env_run_wrapper.iter().map(|s| s.as_str()).collect();
let mut rust_flags = env::var("RUSTFLAGS").ok().unwrap_or("".to_string());
let mut run_wrapper = String::new();
if !is_native {
match target_triple.as_str() {
"aarch64-unknown-linux-gnu" => {
// We are cross-compiling for aarch64. Use the correct linker and run tests in qemu.
rust_flags.insert(0, "-Clinker=aarch64-linux-gnu-gcc");
run_wrapper.extend(["qemu-aarch64", "-L", "/usr/aarch64-linux-gnu"]);
rust_flags = format!("-Clinker=aarch64-linux-gnu-gcc {}", rust_flags);
run_wrapper = "qemu-aarch64 -L /usr/aarch64-linux-gnu".to_string();
},
"x86_64-pc-windows-gnu" => {
// We are cross-compiling for Windows. Run tests in wine.
run_wrapper.push("wine".into());
run_wrapper = "wine".to_string();
}
_ => {
println!("Unknown non-native platform");
@ -367,16 +353,15 @@ pub fn new(host_triple: String, target_triple: String) -> Self {
// FIXME fix `#[linkage = "extern_weak"]` without this
if host_triple.contains("darwin") {
rust_flags.push("-Clink-arg=-undefined");
rust_flags.push("-Clink-arg=dynamic_lookup");
rust_flags = format!("{} -Clink-arg=-undefined -Clink-arg=dynamic_lookup", rust_flags);
}
Self {
root_dir,
out_dir,
jit_supported,
rust_flags: rust_flags.iter().map(|s| s.to_string()).collect(),
run_wrapper: run_wrapper.iter().map(|s| s.to_string()).collect(),
rust_flags,
run_wrapper,
host_triple,
target_triple,
}
@ -384,9 +369,9 @@ pub fn new(host_triple: String, target_triple: String) -> Self {
pub fn run_testsuite(&self, tests: &[TestCase]) {
for &TestCase { config, func } in tests {
let is_jit_test = config.contains("jit");
let (tag, testname) = config.split_once('.').unwrap();
let tag = tag.to_uppercase();
let is_jit_test = tag == "JIT";
if !config::get_bool(config) || (is_jit_test && !self.jit_supported) {
eprintln!("[{tag}] {testname} (skipped)");
@ -428,14 +413,16 @@ fn rustc_command<I, S>(&self, args: I) -> Command
}
let mut cmd = Command::new(rustc_clif);
cmd.args(self.rust_flags.iter());
if !self.rust_flags.is_empty() {
cmd.arg(&self.rust_flags);
}
cmd.arg("-L");
cmd.arg(format!("crate={}", self.out_dir.display()));
cmd.arg("--out-dir");
cmd.arg(format!("{}", self.out_dir.display()));
cmd.arg("-Cdebuginfo=2");
cmd.args(args);
cmd.env("RUSTFLAGS", self.rust_flags.join(" "));
cmd.env("RUSTFLAGS", &self.rust_flags);
cmd
}
@ -454,8 +441,8 @@ fn run_out_command<'a, I>(&self, name: &str, args: I)
let mut full_cmd = vec![];
// Prepend the RUN_WRAPPER's
for rw in self.run_wrapper.iter() {
full_cmd.push(rw.to_string());
if !self.run_wrapper.is_empty() {
full_cmd.push(self.run_wrapper.clone());
}
full_cmd.push({
@ -491,7 +478,7 @@ fn cargo_command<I, S>(&self, args: I) -> Command
let mut cmd = Command::new(cargo_clif);
cmd.args(args);
cmd.env("RUSTFLAGS", self.rust_flags.join(" "));
cmd.env("RUSTFLAGS", &self.rust_flags);
cmd
}