From 31763d28c460933500916707954da1590bfe893d Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Sat, 24 Feb 2024 17:07:24 +0100
Subject: [PATCH] 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.
---
 build.zig      | 7 -------
 test/tests.zig | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/build.zig b/build.zig
index 98025dbb137b0ba9bc621a76f756fd06cd25f38c..d8860eabae7a90e8d3c6b0c96e5503c49ce84fcf 100644
--- a/build.zig
+++ b/build.zig
@@ -101,7 +101,6 @@ pub fn build(b: *std.Build) !void {
     const skip_release_fast = b.option(bool, "skip-release-fast", "Main test suite skips release-fast builds") orelse skip_release;
     const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;
     const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;
-    const skip_cross_glibc = b.option(bool, "skip-cross-glibc", "Main test suite skips builds that require cross glibc") orelse false;
     const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
     const skip_single_threaded = b.option(bool, "skip-single-threaded", "Main test suite skips tests that are single-threaded") orelse false;
     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 {
     test_cases_options.addOption(bool, "enable_logging", enable_logging);
     test_cases_options.addOption(bool, "enable_link_snapshots", enable_link_snapshots);
     test_cases_options.addOption(bool, "skip_non_native", skip_non_native);
-    test_cases_options.addOption(bool, "skip_cross_glibc", skip_cross_glibc);
     test_cases_options.addOption(bool, "have_llvm", enable_llvm);
     test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k);
     test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky);
@@ -474,7 +472,6 @@ pub fn build(b: *std.Build) !void {
         .include_paths = &.{},
         .skip_single_threaded = skip_single_threaded,
         .skip_non_native = skip_non_native,
-        .skip_cross_glibc = skip_cross_glibc,
         .skip_libc = skip_libc,
         .max_rss = 1 * 1024 * 1024 * 1024,
     }));
@@ -488,7 +485,6 @@ pub fn build(b: *std.Build) !void {
         .include_paths = &.{"test/c_import"},
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
-        .skip_cross_glibc = skip_cross_glibc,
         .skip_libc = skip_libc,
     }));
 
@@ -501,7 +497,6 @@ pub fn build(b: *std.Build) !void {
         .include_paths = &.{},
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
-        .skip_cross_glibc = skip_cross_glibc,
         .skip_libc = true,
     }));
 
@@ -514,7 +509,6 @@ pub fn build(b: *std.Build) !void {
         .include_paths = &.{},
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
-        .skip_cross_glibc = skip_cross_glibc,
         .skip_libc = true,
     }));
 
@@ -546,7 +540,6 @@ pub fn build(b: *std.Build) !void {
         .include_paths = &.{},
         .skip_single_threaded = skip_single_threaded,
         .skip_non_native = skip_non_native,
-        .skip_cross_glibc = skip_cross_glibc,
         .skip_libc = skip_libc,
         // I observed a value of 4572626944 on the M2 CI.
         .max_rss = 5029889638,
diff --git a/test/tests.zig b/test/tests.zig
index b07bc50f69b4a4432b3ee21b59d480d07ce31c44..f7e65b6af9aca2c82d0bc3bbe32883df5715fd3a 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -1040,7 +1040,6 @@ const ModuleTestOptions = struct {
     include_paths: []const []const u8,
     skip_single_threaded: bool,
     skip_non_native: bool,
-    skip_cross_glibc: bool,
     skip_libc: bool,
     max_rss: usize = 0,
 };
@@ -1059,10 +1058,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
         const resolved_target = b.resolveTargetQuery(test_target.target);
         const target = resolved_target.result;
 
-        if (options.skip_cross_glibc and !test_target.target.isNative() and
-            target.isGnuLibC() and test_target.link_libc == true)
-            continue;
-
         if (options.skip_libc and test_target.link_libc == true)
             continue;
 
-- 
2.54.0