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 {...@@ -101,7 +101,6 @@ pub fn build(b: *std.Build) !void {
101 const skip_release_fast = b.option(bool, "skip-release-fast", "Main test suite skips release-fast builds") orelse skip_release;101 const skip_release_fast = b.option(bool, "skip-release-fast", "Main test suite skips release-fast builds") orelse skip_release;
102 const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;102 const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;
103 const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;103 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;
105 const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;104 const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
106 const skip_single_threaded = b.option(bool, "skip-single-threaded", "Main test suite skips tests that are single-threaded") orelse false;105 const skip_single_threaded = b.option(bool, "skip-single-threaded", "Main test suite skips tests that are single-threaded") orelse false;
107 const skip_run_translated_c = b.option(bool, "skip-run-translated-c", "Main test suite skips run-translated-c tests") orelse false;106 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 {...@@ -400,7 +399,6 @@ pub fn build(b: *std.Build) !void {
400 test_cases_options.addOption(bool, "enable_logging", enable_logging);399 test_cases_options.addOption(bool, "enable_logging", enable_logging);
401 test_cases_options.addOption(bool, "enable_link_snapshots", enable_link_snapshots);400 test_cases_options.addOption(bool, "enable_link_snapshots", enable_link_snapshots);
402 test_cases_options.addOption(bool, "skip_non_native", skip_non_native);401 test_cases_options.addOption(bool, "skip_non_native", skip_non_native);
403 test_cases_options.addOption(bool, "skip_cross_glibc", skip_cross_glibc);
404 test_cases_options.addOption(bool, "have_llvm", enable_llvm);402 test_cases_options.addOption(bool, "have_llvm", enable_llvm);
405 test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k);403 test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k);
406 test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky);404 test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky);
...@@ -474,7 +472,6 @@ pub fn build(b: *std.Build) !void {...@@ -474,7 +472,6 @@ pub fn build(b: *std.Build) !void {
474 .include_paths = &.{},472 .include_paths = &.{},
475 .skip_single_threaded = skip_single_threaded,473 .skip_single_threaded = skip_single_threaded,
476 .skip_non_native = skip_non_native,474 .skip_non_native = skip_non_native,
477 .skip_cross_glibc = skip_cross_glibc,
478 .skip_libc = skip_libc,475 .skip_libc = skip_libc,
479 .max_rss = 1 * 1024 * 1024 * 1024,476 .max_rss = 1 * 1024 * 1024 * 1024,
480 }));477 }));
...@@ -488,7 +485,6 @@ pub fn build(b: *std.Build) !void {...@@ -488,7 +485,6 @@ pub fn build(b: *std.Build) !void {
488 .include_paths = &.{"test/c_import"},485 .include_paths = &.{"test/c_import"},
489 .skip_single_threaded = true,486 .skip_single_threaded = true,
490 .skip_non_native = skip_non_native,487 .skip_non_native = skip_non_native,
491 .skip_cross_glibc = skip_cross_glibc,
492 .skip_libc = skip_libc,488 .skip_libc = skip_libc,
493 }));489 }));
494490
...@@ -501,7 +497,6 @@ pub fn build(b: *std.Build) !void {...@@ -501,7 +497,6 @@ pub fn build(b: *std.Build) !void {
501 .include_paths = &.{},497 .include_paths = &.{},
502 .skip_single_threaded = true,498 .skip_single_threaded = true,
503 .skip_non_native = skip_non_native,499 .skip_non_native = skip_non_native,
504 .skip_cross_glibc = skip_cross_glibc,
505 .skip_libc = true,500 .skip_libc = true,
506 }));501 }));
507502
...@@ -514,7 +509,6 @@ pub fn build(b: *std.Build) !void {...@@ -514,7 +509,6 @@ pub fn build(b: *std.Build) !void {
514 .include_paths = &.{},509 .include_paths = &.{},
515 .skip_single_threaded = true,510 .skip_single_threaded = true,
516 .skip_non_native = skip_non_native,511 .skip_non_native = skip_non_native,
517 .skip_cross_glibc = skip_cross_glibc,
518 .skip_libc = true,512 .skip_libc = true,
519 }));513 }));
520514
...@@ -546,7 +540,6 @@ pub fn build(b: *std.Build) !void {...@@ -546,7 +540,6 @@ pub fn build(b: *std.Build) !void {
546 .include_paths = &.{},540 .include_paths = &.{},
547 .skip_single_threaded = skip_single_threaded,541 .skip_single_threaded = skip_single_threaded,
548 .skip_non_native = skip_non_native,542 .skip_non_native = skip_non_native,
549 .skip_cross_glibc = skip_cross_glibc,
550 .skip_libc = skip_libc,543 .skip_libc = skip_libc,
551 // I observed a value of 4572626944 on the M2 CI.544 // I observed a value of 4572626944 on the M2 CI.
552 .max_rss = 5029889638,545 .max_rss = 5029889638,
test/tests.zig-5
...@@ -1040,7 +1040,6 @@ const ModuleTestOptions = struct {...@@ -1040,7 +1040,6 @@ const ModuleTestOptions = struct {
1040 include_paths: []const []const u8,1040 include_paths: []const []const u8,
1041 skip_single_threaded: bool,1041 skip_single_threaded: bool,
1042 skip_non_native: bool,1042 skip_non_native: bool,
1043 skip_cross_glibc: bool,
1044 skip_libc: bool,1043 skip_libc: bool,
1045 max_rss: usize = 0,1044 max_rss: usize = 0,
1046};1045};
...@@ -1059,10 +1058,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {...@@ -1059,10 +1058,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
1059 const resolved_target = b.resolveTargetQuery(test_target.target);1058 const resolved_target = b.resolveTargetQuery(test_target.target);
1060 const target = resolved_target.result;1059 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
1066 if (options.skip_libc and test_target.link_libc == true)1061 if (options.skip_libc and test_target.link_libc == true)
1067 continue;1062 continue;
10681063