authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-02-24 17:07:24+01:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-02-24 23:23:15+01:00
log31763d28c460933500916707954da1590bfe893d
treef689206240b1d728c264b6e03fcf953763a529d7
parentb344ff01d380d85256929b6be2428d3c022a8580

Revert "tests: add -Dskip-cross-glibc option"

This reverts commit bc0f246911a35324473f72b770cc5715902cc912. This was added as a workaround for a bug that has since been fixed.

2 files changed, 0 insertions(+), 12 deletions(-)

build.zig-7
......@@ -101,7 +101,6 @@ pub fn build(b: *std.Build) !void {
101101 const skip_release_fast = b.option(bool, "skip-release-fast", "Main test suite skips release-fast builds") orelse skip_release;
102102 const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;
103103 const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;
104 const skip_cross_glibc = b.option(bool, "skip-cross-glibc", "Main test suite skips builds that require cross glibc") orelse false;
105104 const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
106105 const skip_single_threaded = b.option(bool, "skip-single-threaded", "Main test suite skips tests that are single-threaded") orelse false;
107106 const skip_run_translated_c = b.option(bool, "skip-run-translated-c", "Main test suite skips run-translated-c tests") orelse false;
......@@ -400,7 +399,6 @@ pub fn build(b: *std.Build) !void {
400399 test_cases_options.addOption(bool, "enable_logging", enable_logging);
401400 test_cases_options.addOption(bool, "enable_link_snapshots", enable_link_snapshots);
402401 test_cases_options.addOption(bool, "skip_non_native", skip_non_native);
403 test_cases_options.addOption(bool, "skip_cross_glibc", skip_cross_glibc);
404402 test_cases_options.addOption(bool, "have_llvm", enable_llvm);
405403 test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k);
406404 test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky);
......@@ -474,7 +472,6 @@ pub fn build(b: *std.Build) !void {
474472 .include_paths = &.{},
475473 .skip_single_threaded = skip_single_threaded,
476474 .skip_non_native = skip_non_native,
477 .skip_cross_glibc = skip_cross_glibc,
478475 .skip_libc = skip_libc,
479476 .max_rss = 1 * 1024 * 1024 * 1024,
480477 }));
......@@ -488,7 +485,6 @@ pub fn build(b: *std.Build) !void {
488485 .include_paths = &.{"test/c_import"},
489486 .skip_single_threaded = true,
490487 .skip_non_native = skip_non_native,
491 .skip_cross_glibc = skip_cross_glibc,
492488 .skip_libc = skip_libc,
493489 }));
494490
......@@ -501,7 +497,6 @@ pub fn build(b: *std.Build) !void {
501497 .include_paths = &.{},
502498 .skip_single_threaded = true,
503499 .skip_non_native = skip_non_native,
504 .skip_cross_glibc = skip_cross_glibc,
505500 .skip_libc = true,
506501 }));
507502
......@@ -514,7 +509,6 @@ pub fn build(b: *std.Build) !void {
514509 .include_paths = &.{},
515510 .skip_single_threaded = true,
516511 .skip_non_native = skip_non_native,
517 .skip_cross_glibc = skip_cross_glibc,
518512 .skip_libc = true,
519513 }));
520514
......@@ -546,7 +540,6 @@ pub fn build(b: *std.Build) !void {
546540 .include_paths = &.{},
547541 .skip_single_threaded = skip_single_threaded,
548542 .skip_non_native = skip_non_native,
549 .skip_cross_glibc = skip_cross_glibc,
550543 .skip_libc = skip_libc,
551544 // I observed a value of 4572626944 on the M2 CI.
552545 .max_rss = 5029889638,
test/tests.zig-5
......@@ -1040,7 +1040,6 @@ const ModuleTestOptions = struct {
10401040 include_paths: []const []const u8,
10411041 skip_single_threaded: bool,
10421042 skip_non_native: bool,
1043 skip_cross_glibc: bool,
10441043 skip_libc: bool,
10451044 max_rss: usize = 0,
10461045};
......@@ -1059,10 +1058,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
10591058 const resolved_target = b.resolveTargetQuery(test_target.target);
10601059 const target = resolved_target.result;
10611060
1062 if (options.skip_cross_glibc and !test_target.target.isNative() and
1063 target.isGnuLibC() and test_target.link_libc == true)
1064 continue;
1065
10661061 if (options.skip_libc and test_target.link_libc == true)
10671062 continue;
10681063