diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-11-14 22:39:12 +0100 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2025-11-15 14:23:34 +0100 |
| commit | bbdf8eaf75d651fe26da2cd59bd2ee8795a0d556 (patch) | |
| tree | e3be4beb9b8fcf5445b3771998e7375808447722 /test | |
| parent | 3649aeb42602d0c24008a49b304b8bfc361dd4a2 (diff) | |
| download | zig-bbdf8eaf75d651fe26da2cd59bd2ee8795a0d556.tar.gz zig-bbdf8eaf75d651fe26da2cd59bd2ee8795a0d556.zip | |
build: change -Dskip-macos to -Dskip-darwin and make it cover all darwin OSs
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/Cases.zig | 4 | ||||
| -rw-r--r-- | test/tests.zig | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/src/Cases.zig b/test/src/Cases.zig index 2fdcc45195..95ee7e21e7 100644 --- a/test/src/Cases.zig +++ b/test/src/Cases.zig @@ -447,7 +447,7 @@ pub const CaseTestOptions = struct { skip_freebsd: bool, skip_netbsd: bool, skip_windows: bool, - skip_macos: bool, + skip_darwin: bool, skip_linux: bool, skip_llvm: bool, skip_libc: bool, @@ -475,7 +475,7 @@ pub fn lowerToBuildSteps( 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; - if (options.skip_macos and case.target.query.os_tag == .macos) continue; + if (options.skip_darwin and case.target.query.os_tag != null and case.target.query.os_tag.?.isDarwin()) continue; if (options.skip_linux and case.target.query.os_tag == .linux) continue; const would_use_llvm = @import("../tests.zig").wouldUseLlvm( diff --git a/test/tests.zig b/test/tests.zig index a6931c408f..75e5d4439a 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -2234,7 +2234,7 @@ const ModuleTestOptions = struct { skip_freebsd: bool, skip_netbsd: bool, skip_windows: bool, - skip_macos: bool, + skip_darwin: bool, skip_linux: bool, skip_llvm: bool, skip_libc: bool, @@ -2269,7 +2269,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { 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; - if (options.skip_macos and test_target.target.os_tag == .macos) continue; + if (options.skip_darwin and test_target.target.os_tag != null and test_target.target.os_tag.?.isDarwin()) continue; if (options.skip_linux and test_target.target.os_tag == .linux) continue; const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode); @@ -2506,7 +2506,7 @@ const CAbiTestOptions = struct { skip_freebsd: bool, skip_netbsd: bool, skip_windows: bool, - skip_macos: bool, + skip_darwin: bool, skip_linux: bool, skip_llvm: bool, skip_release: bool, @@ -2525,7 +2525,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step { 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; - if (options.skip_macos and c_abi_target.target.os_tag == .macos) continue; + if (options.skip_darwin and c_abi_target.target.os_tag != null and c_abi_target.target.os_tag.?.isDarwin()) continue; if (options.skip_linux and c_abi_target.target.os_tag == .linux) continue; const would_use_llvm = wouldUseLlvm(c_abi_target.use_llvm, c_abi_target.target, .Debug); |