build: add some missing darwin tags

This avoids pessimizing concurrency on all machines due to e.g. the macOS
machine having high memory usage across the board due to 16K page size.

build.zig

@@ -91,8 +91,6 @@ pub fn build(b: *std.Build) !void {
     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_compile_errors = b.option(bool, "skip-compile-errors", "Main test suite skips compile error tests") orelse false;
-    const skip_spirv = b.option(bool, "skip-spirv", "Main test suite skips targets with spirv32/spirv64 architecture") orelse false;
-    const skip_wasm = b.option(bool, "skip-wasm", "Main test suite skips targets with wasm32/wasm64 architecture") orelse false;
     const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false;
     const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false;
     const skip_windows = b.option(bool, "skip-windows", "Main test suite skips targets with windows OS") orelse false;
@@ -423,8 +421,6 @@ pub fn build(b: *std.Build) !void {
         .test_target_filters = test_target_filters,
         .skip_compile_errors = skip_compile_errors,
         .skip_non_native = skip_non_native,
-        .skip_spirv = skip_spirv,
-        .skip_wasm = skip_wasm,
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
@@ -456,8 +452,6 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = skip_single_threaded,
         .skip_non_native = skip_non_native,
         .test_default_only = no_matrix,
-        .skip_spirv = skip_spirv,
-        .skip_wasm = skip_wasm,
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
@@ -467,26 +461,26 @@ pub fn build(b: *std.Build) !void {
         .skip_libc = skip_libc,
         .max_rss = switch (b.graph.host.result.os.tag) {
             .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 896_722_534,
-                else => 900_000_000,
+                .x86_64 => 1, // TODO
+                else => 0,
             },
             .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 659_809_075,
-                .loongarch64 => 598_902_374,
-                .riscv64 => 731_258_880,
-                .s390x => 580_596_121,
-                .x86_64 => 3_290_894_745,
-                else => 3_300_000_000,
+                .aarch64 => 659809075,
+                .loongarch64 => 598902374,
+                .riscv64 => 1, // TODO
+                .s390x => 580596121,
+                .x86_64 => 3290894745,
+                else => 0,
             },
             .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 767_736_217,
-                else => 800_000_000,
+                .aarch64 => 767736217,
+                else => 0,
             },
             .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 603_070_054,
-                else => 700_000_000,
+                .x86_64 => 603070054,
+                else => 0,
             },
-            else => 3_300_000_000,
+            else => 0,
         },
     }));
 
@@ -502,8 +496,6 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
         .test_default_only = no_matrix,
-        .skip_spirv = skip_spirv,
-        .skip_wasm = skip_wasm,
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
@@ -514,26 +506,26 @@ pub fn build(b: *std.Build) !void {
         .no_builtin = true,
         .max_rss = switch (b.graph.host.result.os.tag) {
             .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 743_802_470,
-                else => 800_000_000,
+                .x86_64 => 1, // TODO
+                else => 0,
             },
             .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 639_565_414,
-                .loongarch64 => 598_884_352,
-                .riscv64 => 636_429_516,
-                .s390x => 574_166_630,
-                .x86_64 => 764_861_644,
-                else => 800_000_000,
+                .aarch64 => 639565414,
+                .loongarch64 => 598884352,
+                .riscv64 => 1, // TODO
+                .s390x => 574166630,
+                .x86_64 => 764861644,
+                else => 0,
             },
             .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 701_413_785,
-                else => 800_000_000,
+                .aarch64 => 701413785,
+                else => 0,
             },
             .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 536_414_208,
-                else => 600_000_000,
+                .x86_64 => 536414208,
+                else => 0,
             },
-            else => 1_100_000_000,
+            else => 0,
         },
     }));
 
@@ -549,8 +541,6 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
         .test_default_only = no_matrix,
-        .skip_spirv = skip_spirv,
-        .skip_wasm = skip_wasm,
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
@@ -561,26 +551,26 @@ pub fn build(b: *std.Build) !void {
         .no_builtin = true,
         .max_rss = switch (b.graph.host.result.os.tag) {
             .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 557_892_403,
-                else => 600_000_000,
+                .x86_64 => 1, // TODO
+                else => 0,
             },
             .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 615_302_758,
-                .loongarch64 => 598_974_464,
-                .riscv64 => 382_786_764,
-                .s390x => 395_555_635,
-                .x86_64 => 528_128_409,
-                else => 700_000_000,
+                .aarch64 => 615302758,
+                .loongarch64 => 598974464,
+                .riscv64 => 1, // TODO
+                .s390x => 395555635,
+                .x86_64 => 528128409,
+                else => 0,
             },
             .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 451_389_030,
-                else => 500_000_000,
+                .aarch64 => 451389030,
+                else => 0,
             },
             .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 367_747_072,
-                else => 400_000_000,
+                .x86_64 => 317852057,
+                else => 0,
             },
-            else => 700_000_000,
+            else => 0,
         },
     }));
 
@@ -596,8 +586,6 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = skip_single_threaded,
         .skip_non_native = skip_non_native,
         .test_default_only = no_matrix,
-        .skip_spirv = skip_spirv,
-        .skip_wasm = skip_wasm,
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
@@ -607,26 +595,26 @@ pub fn build(b: *std.Build) !void {
         .skip_libc = skip_libc,
         .max_rss = switch (b.graph.host.result.os.tag) {
             .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 3_756_422_348,
-                else => 3_800_000_000,
+                .x86_64 => 1, // TODO
+                else => 0,
             },
             .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 6_732_817_203,
-                .loongarch64 => 3_216_349_593,
-                .riscv64 => 3_570_899_763,
-                .s390x => 3_652_514_201,
-                .x86_64 => 3_249_546_854,
-                else => 6_800_000_000,
+                .aarch64 => 6732817203,
+                .loongarch64 => 3216349593,
+                .riscv64 => 1, // TODO
+                .s390x => 3652514201,
+                .x86_64 => 5554053120,
+                else => 0,
             },
             .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 8_273_795_481,
-                else => 8_300_000_000,
+                .aarch64 => 8273795481,
+                else => 0,
             },
             .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 3_750_236_160,
-                else => 3_800_000_000,
+                .x86_64 => 3750236160,
+                else => 0,
             },
-            else => 8_300_000_000,
+            else => 0,
         },
     }));
 
@@ -643,29 +631,7 @@ pub fn build(b: *std.Build) !void {
         .use_llvm = use_llvm,
         .use_lld = use_llvm,
         .zig_lib_dir = b.path("lib"),
-        .max_rss = switch (b.graph.host.result.os.tag) {
-            .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 2_188_099_584,
-                else => 2_200_000_000,
-            },
-            .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 1_991_934_771,
-                .loongarch64 => 1_844_538_572,
-                .riscv64 => 1, // TODO
-                .s390x => 1_781_248_409,
-                .x86_64 => 977_192_550,
-                else => 2_000_000_000,
-            },
-            .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 2_062_393_344,
-                else => 2_100_000_000,
-            },
-            .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 1_953_087_488,
-                else => 2_000_000_000,
-            },
-            else => 2_200_000_000,
-        },
+        .max_rss = 1,
     });
     if (link_libc) {
         unit_tests.root_module.link_libc = true;
@@ -683,7 +649,6 @@ pub fn build(b: *std.Build) !void {
     test_step.dependOn(tests.addCAbiTests(b, .{
         .test_target_filters = test_target_filters,
         .skip_non_native = skip_non_native,
-        .skip_wasm = skip_wasm,
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
@@ -691,29 +656,6 @@ pub fn build(b: *std.Build) !void {
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_release = skip_release,
-        .max_rss = switch (b.graph.host.result.os.tag) {
-            .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 566_218_752,
-                else => 600_000_000,
-            },
-            .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 1_318_185_369,
-                .loongarch64 => 1_422_904_524,
-                .riscv64 => 449_924_710,
-                .s390x => 1_946_743_603,
-                .x86_64 => 2_139_993_292,
-                else => 2_200_000_000,
-            },
-            .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 1_813_612_134,
-                else => 1_900_000_000,
-            },
-            .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 386_287_616,
-                else => 400_000_000,
-            },
-            else => 2_200_000_000,
-        },
     }));
     test_step.dependOn(tests.addLinkTests(b, enable_macos_sdk, enable_ios_sdk, enable_symlinks_windows));
     test_step.dependOn(tests.addStackTraceTests(b, test_filters, skip_non_native));
@@ -763,7 +705,6 @@ pub fn build(b: *std.Build) !void {
         .optimize_modes = optimization_modes,
         .test_filters = test_filters,
         .test_target_filters = test_target_filters,
-        .skip_wasm = skip_wasm,
         // Highest RSS observed in any test case was exactly 1802878976 on x86_64-linux.
         .max_rss = 2253598720,
     })) |test_libc_step| test_step.dependOn(test_libc_step);
@@ -871,26 +812,26 @@ fn addCompilerStep(b: *std.Build, options: AddCompilerModOptions) *std.Build.Ste
         .name = "zig",
         .max_rss = switch (b.graph.host.result.os.tag) {
             .freebsd => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 6_044_158_771,
-                else => 6_100_000_000,
+                .x86_64 => 1, // TODO
+                else => 0,
             },
             .linux => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 6_240_805_683,
-                .loongarch64 => 5_024_158_515,
-                .riscv64 => 6_996_309_196,
-                .s390x => 4_997_174_476,
-                .x86_64 => 5_486_090_649,
-                else => 7_000_000_000,
+                .aarch64 => 6240805683,
+                .loongarch64 => 5024158515,
+                .riscv64 => 1, // TODO
+                .s390x => 4997174476,
+                .x86_64 => 5486090649,
+                else => 0,
             },
             .macos => switch (b.graph.host.result.cpu.arch) {
-                .aarch64 => 6_639_145_779,
-                else => 6_700_000_000,
+                .aarch64 => 6639145779,
+                else => 0,
             },
             .windows => switch (b.graph.host.result.cpu.arch) {
-                .x86_64 => 5_770_394_009,
-                else => 5_800_000_000,
+                .x86_64 => 5770394009,
+                else => 0,
             },
-            else => 7_000_000_000,
+            else => 0,
         },
         .root_module = addCompilerMod(b, options),
     });

ci/aarch64-linux-debug.sh

@@ -44,7 +44,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 44918199637 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dtarget=native-native-musl \

ci/aarch64-linux-release.sh

@@ -44,7 +44,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-release/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 44918199637 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dtarget=native-native-musl \

ci/aarch64-macos-debug.sh

@@ -42,7 +42,6 @@ cmake .. \
 ninja install
 
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
   --zig-lib-dir "$PWD/../lib" \
   -Denable-macos-sdk \
   -Dstatic-llvm \

ci/aarch64-macos-release.sh

@@ -51,7 +51,6 @@ stage3-release/bin/zig build test docs \
 
 # Ensure that stage3 and stage4 are byte-for-byte identical.
 stage3-release/bin/zig build \
-  --maxrss ${ZSF_MAX_RSS:-0} \
   --prefix stage4-release \
   -Denable-llvm \
   -Dno-lib \

ci/aarch64-windows.ps1

@@ -5,7 +5,6 @@ $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip
 $PREFIX_PATH = "$(Get-Location)\..\$ZIG_LLVM_CLANG_LLD_NAME"
 $ZIG = "$PREFIX_PATH\bin\zig.exe"
 $ZIG_LIB_DIR = "$(Get-Location)\lib"
-$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
 
 if (!(Test-Path "..\$ZIG_LLVM_CLANG_LLD_NAME.zip")) {
     Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
@@ -55,7 +54,6 @@ CheckLastExitCode
 
 Write-Output "Main test suite..."
 & "stage3-release\bin\zig.exe" build test docs `
-  --maxrss $ZSF_MAX_RSS `
   --zig-lib-dir "$ZIG_LIB_DIR" `
   --search-prefix "$PREFIX_PATH" `
   -Dstatic-llvm `

ci/loongarch64-linux-debug.sh

@@ -45,7 +45,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 60129542144 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dtarget=native-native-musl \

ci/loongarch64-linux-release.sh

@@ -45,7 +45,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-release/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 60129542144 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dtarget=native-native-musl \

ci/riscv64-linux-debug.sh

@@ -44,7 +44,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-debug/bin/zig build test-cases test-modules test-unit test-c-abi test-stack-traces test-error-traces test-llvm-ir \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 68719476736 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dskip-single-threaded \

ci/riscv64-linux-release.sh

@@ -44,7 +44,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-release/bin/zig build test-cases test-modules test-unit test-c-abi test-stack-traces test-error-traces test-llvm-ir \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 68719476736 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dskip-single-threaded \

ci/s390x-linux-debug.sh

@@ -45,7 +45,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 30064771072 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dtarget=native-native-musl \

ci/s390x-linux-release.sh

@@ -45,7 +45,7 @@ ninja install
 
 # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
 stage3-release/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 30064771072 \
   -Dstatic-llvm \
   -Dskip-non-native \
   -Dtarget=native-native-musl \

ci/x86_64-freebsd-debug.sh

@@ -44,10 +44,8 @@ unset CXX
 ninja install
 
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 42949672960 \
   -Dstatic-llvm \
-  -Dskip-spirv \
-  -Dskip-wasm \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \

ci/x86_64-freebsd-release.sh

@@ -44,10 +44,8 @@ unset CXX
 ninja install
 
 stage3-release/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 42949672960 \
   -Dstatic-llvm \
-  -Dskip-spirv \
-  -Dskip-wasm \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \

ci/x86_64-linux-debug-llvm.sh

@@ -49,7 +49,7 @@ stage3-debug/bin/zig build \
   -Dno-lib
 
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 21000000000 \
   -Dlldb=$HOME/deps/lldb-zig/Debug-e0a42bb34/bin/lldb \
   -fqemu \
   -fwasmtime \

ci/x86_64-linux-debug.sh

@@ -48,7 +48,7 @@ stage3-debug/bin/zig build \
   -Dno-lib
 
 stage3-debug/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 21000000000 \
   -Dlldb=$HOME/deps/lldb-zig/Debug-e0a42bb34/bin/lldb \
   -fqemu \
   -fwasmtime \

ci/x86_64-linux-release.sh

@@ -54,7 +54,7 @@ stage3-release/bin/zig build \
   -Dno-lib
 
 stage3-release/bin/zig build test docs \
-  --maxrss ${ZSF_MAX_RSS:-0} \
+  --maxrss 21000000000 \
   -Dlldb=$HOME/deps/lldb-zig/Release-e0a42bb34/bin/lldb \
   -fqemu \
   -fwasmtime \

ci/x86_64-windows-debug.ps1

@@ -5,7 +5,6 @@ $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip
 $PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME"
 $ZIG = "$PREFIX_PATH\bin\zig.exe"
 $ZIG_LIB_DIR = "$(Get-Location)\lib"
-$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
 
 if (!(Test-Path "$PREFIX_PATH.zip")) {
     Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
@@ -55,11 +54,12 @@ CheckLastExitCode
 
 Write-Output "Main test suite..."
 & "stage3-debug\bin\zig.exe" build test docs `
-  --maxrss $ZSF_MAX_RSS `
+  --maxrss 32212254720 `
   --zig-lib-dir "$ZIG_LIB_DIR" `
   --search-prefix "$PREFIX_PATH" `
   -Dstatic-llvm `
   -Dskip-non-native `
+  -Dskip-release `
   -Dskip-test-incremental `
   -Denable-symlinks-windows `
   --test-timeout 30m

ci/x86_64-windows-release.ps1

@@ -5,7 +5,6 @@ $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip
 $PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME"
 $ZIG = "$PREFIX_PATH\bin\zig.exe"
 $ZIG_LIB_DIR = "$(Get-Location)\lib"
-$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
 
 if (!(Test-Path "$PREFIX_PATH.zip")) {
     Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
@@ -55,7 +54,7 @@ CheckLastExitCode
 
 Write-Output "Main test suite..."
 & "stage3-release\bin\zig.exe" build test docs `
-  --maxrss $ZSF_MAX_RSS `
+  --maxrss 32212254720 `
   --zig-lib-dir "$ZIG_LIB_DIR" `
   --search-prefix "$PREFIX_PATH" `
   -Dstatic-llvm `

test/src/Cases.zig

@@ -444,8 +444,6 @@ pub const CaseTestOptions = struct {
     test_target_filters: []const []const u8,
     skip_compile_errors: bool,
     skip_non_native: bool,
-    skip_spirv: bool,
-    skip_wasm: bool,
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
@@ -474,9 +472,6 @@ pub fn lowerToBuildSteps(
         if (options.skip_non_native and !case.target.query.isNative())
             continue;
 
-        if (options.skip_spirv and case.target.query.cpu_arch != null and case.target.query.cpu_arch.?.isSpirV()) continue;
-        if (options.skip_wasm and case.target.query.cpu_arch != null and case.target.query.cpu_arch.?.isWasm()) continue;
-
         if (options.skip_freebsd and case.target.query.os_tag == .freebsd) continue;
         if (options.skip_netbsd and case.target.query.os_tag == .netbsd) continue;
         if (options.skip_windows and case.target.query.os_tag == .windows) continue;

test/src/Libc.zig

@@ -10,7 +10,6 @@ pub const Options = struct {
     optimize_modes: []const std.builtin.OptimizeMode,
     test_filters: []const []const u8,
     test_target_filters: []const []const u8,
-    skip_wasm: bool,
     max_rss: usize,
 };
 
@@ -42,8 +41,6 @@ pub fn addLibcTestCase(
 }
 
 pub fn addTarget(libc: *const Libc, target: std.Build.ResolvedTarget) void {
-    if (libc.options.skip_wasm and target.query.cpu_arch != null and target.query.cpu_arch.?.isWasm()) return;
-
     if (libc.options.test_target_filters.len > 0) {
         const triple_txt = target.query.zigTriple(libc.b.allocator) catch @panic("OOM");
         for (libc.options.test_target_filters) |filter| {

test/tests.zig

@@ -2246,8 +2246,6 @@ const ModuleTestOptions = struct {
     test_default_only: bool,
     skip_single_threaded: bool,
     skip_non_native: bool,
-    skip_spirv: bool,
-    skip_wasm: bool,
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
@@ -2283,9 +2281,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
         if (options.skip_non_native and !test_target.target.isNative())
             continue;
 
-        if (options.skip_spirv and test_target.target.cpu_arch != null and test_target.target.cpu_arch.?.isSpirV()) continue;
-        if (options.skip_wasm and test_target.target.cpu_arch != null and test_target.target.cpu_arch.?.isWasm()) continue;
-
         if (options.skip_freebsd and test_target.target.os_tag == .freebsd) continue;
         if (options.skip_netbsd and test_target.target.os_tag == .netbsd) continue;
         if (options.skip_windows and test_target.target.os_tag == .windows) continue;
@@ -2344,8 +2339,8 @@ fn addOneModuleTest(
     const libc_suffix = if (test_target.link_libc == true) "-libc" else "";
     const model_txt = target.cpu.model.name;
 
-    // These targets need a lot more RAM for unknown reasons.
-    const max_rss = if (mem.eql(u8, options.name, "std") and (target.cpu.arch == .hexagon or target.cpu.arch.isRISCV() or target.cpu.arch.isWasm()))
+    // wasm32-wasi builds need more RAM, idk why
+    const max_rss = if (target.os.tag == .wasi)
         options.max_rss * 2
     else
         options.max_rss;
@@ -2524,7 +2519,6 @@ pub fn wouldUseLlvm(use_llvm: ?bool, query: std.Target.Query, optimize_mode: Opt
 const CAbiTestOptions = struct {
     test_target_filters: []const []const u8,
     skip_non_native: bool,
-    skip_wasm: bool,
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
@@ -2532,7 +2526,6 @@ const CAbiTestOptions = struct {
     skip_linux: bool,
     skip_llvm: bool,
     skip_release: bool,
-    max_rss: usize = 0,
 };
 
 pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step {
@@ -2545,9 +2538,6 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step {
 
         for (c_abi_targets) |c_abi_target| {
             if (options.skip_non_native and !c_abi_target.target.isNative()) continue;
-
-            if (options.skip_wasm and c_abi_target.target.cpu_arch != null and c_abi_target.target.cpu_arch.?.isWasm()) continue;
-
             if (options.skip_freebsd and c_abi_target.target.os_tag == .freebsd) continue;
             if (options.skip_netbsd and c_abi_target.target.os_tag == .netbsd) continue;
             if (options.skip_windows and c_abi_target.target.os_tag == .windows) continue;
@@ -2605,7 +2595,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step {
                 .root_module = test_mod,
                 .use_llvm = c_abi_target.use_llvm,
                 .use_lld = c_abi_target.use_lld,
-                .max_rss = options.max_rss,
+                .max_rss = 1,
             });
 
             // This test is intentionally trying to check if the external ABI is