Skip to content

Speed up project tests #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
antoyo wants to merge 1 commit into from
Closed

Speed up project tests #981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions build_system/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,11 +726,11 @@ where

struct Project {
url: &'static str,
/// Arguments added to both the `cargo build` and the `cargo test` invocations.
/// Arguments added to the `cargo test` invocation.
cargo_arguments: &'static [&'static str],
/// Arguments forwarded to the test harness by `cargo test`.
test_harness_arguments: &'static [&'static str],
/// Variables added to the environment of both invocations.
/// Variables added to the environment of the `cargo test` invocation.
environment_variables: &'static [(&'static str, &'static str)],
}

Expand Down Expand Up @@ -764,8 +764,8 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
// own CI; this one renders text decorations a pixel off with the versions Ubuntu ships.
Project::new("https://gitlab.gnome.org/GNOME/librsvg")
.test_harness_arguments(&["--skip", "tests::svg1_1_text_text_03_b_svg", "--exact"])
// A debug build of librsvg needs about 5 MB of stack per `cargo test` thread to reach
// its maximum layer nesting depth; librsvg's own CI sets the same value.
// librsvg needs several megabytes of stack per `cargo test` thread to reach its
// maximum layer nesting depth; librsvg's own CI sets the same value.
.environment_variables(&[("RUST_MIN_STACK", "8388608")]),
Project::new("https://github.com/rust-random/getrandom"),
Project::new("https://github.com/BurntSushi/memchr"),
Expand All @@ -792,6 +792,11 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
let rustflags =
format!("{} --cap-lints allow", env.get("RUSTFLAGS").cloned().unwrap_or_default());
env.insert("RUSTFLAGS".to_string(), rustflags);
// Building the projects twice, once optimized and once not, doubles the compilation time for
// nothing: the two profiles share no artifact. Test in release mode only, but keep the checks
// that the tests would otherwise lose by not being built in debug mode.
env.insert("CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS".to_string(), "true".to_string());
env.insert("CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS".to_string(), "true".to_string());
let run_tests =
|projects_path, iter: &mut dyn Iterator<Item = &Project>| -> Result<(), String> {
for project in iter {
Expand All @@ -803,13 +808,7 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
project_environment.insert(name.to_string(), value.to_string());
}

let mut build_command: Vec<&dyn AsRef<OsStr>> = vec![&"build", &"--release"];
build_command.extend(
project.cargo_arguments.iter().map(|argument| argument as &dyn AsRef<OsStr>),
);
run_cargo_command(&build_command, Some(repo_path), &project_environment, args)?;

let mut test_command: Vec<&dyn AsRef<OsStr>> = vec![&"test"];
let mut test_command: Vec<&dyn AsRef<OsStr>> = vec![&"test", &"--release"];
test_command.extend(
project.cargo_arguments.iter().map(|argument| argument as &dyn AsRef<OsStr>),
);
Expand Down
Loading