feat: enhance automatic test skipping logic for multilib builds

This commit is contained in:
2026-03-15 22:05:10 -05:00
parent 0d768e0941
commit db0dcb2ff5
8 changed files with 132 additions and 19 deletions
+8 -2
View File
@@ -177,8 +177,14 @@ pub fn build(
}
}
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
if spec.should_skip_automatic_tests() {
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
} else {
crate::log_info!(
"Skipping tests: automatic tests are disabled for multilib builds"
);
}
} else {
let test_dirs = resolve_make_dirs(
&build_dir,
+8 -2
View File
@@ -127,8 +127,14 @@ pub fn build(
anyhow::bail!("cmake build failed");
}
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
if spec.should_skip_automatic_tests() {
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
} else {
crate::log_info!(
"Skipping tests: automatic tests are disabled for multilib builds"
);
}
} else {
let test_targets = phase_targets(&flags.make_test_target, &flags.make_test_targets);
if !cmake_uses_default_ctest(flags) {
+8 -2
View File
@@ -86,8 +86,14 @@ pub fn build(
anyhow::bail!("ninja build failed");
}
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
if spec.should_skip_automatic_tests() {
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
} else {
crate::log_info!(
"Skipping tests: automatic tests are disabled for multilib builds"
);
}
} else {
let test_suites = meson_test_suites(flags);
if test_suites.is_empty() {
+8 -2
View File
@@ -116,8 +116,14 @@ pub fn build(
}
}
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
if spec.should_skip_automatic_tests() {
if flags.skip_tests {
crate::log_info!("Skipping tests: disabled by build.flags.skip_tests");
} else {
crate::log_info!(
"Skipping tests: automatic tests are disabled for multilib builds"
);
}
} else {
let test_dirs = autotools::resolve_make_dirs(
&actual_src,