| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-11-14 22:39:12+01:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2025-11-15 14:23:34+01:00 |
| log | bbdf8eaf75d651fe26da2cd59bd2ee8795a0d556 |
| tree | e3be4beb9b8fcf5445b3771998e7375808447722 |
| parent | 3649aeb42602d0c24008a49b304b8bfc361dd4a2 |
| signature |  Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
build: change -Dskip-macos to -Dskip-darwin and make it cover all darwin OSs
7 files changed, 17 insertions(+), 17 deletions(-)
build.zig+7-7
| ... | @@ -94,7 +94,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -94,7 +94,7 @@ pub fn build(b: *std.Build) !void { |
| 94 | const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false; | 94 | const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false; |
| 95 | const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false; | 95 | const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false; |
| 96 | const skip_windows = b.option(bool, "skip-windows", "Main test suite skips targets with windows OS") orelse false; | 96 | const skip_windows = b.option(bool, "skip-windows", "Main test suite skips targets with windows OS") orelse false; |
| 97 | const skip_macos = b.option(bool, "skip-macos", "Main test suite skips targets with macos OS") orelse false; | 97 | const skip_darwin = b.option(bool, "skip-darwin", "Main test suite skips targets with darwin OSs") orelse false; |
| 98 | const skip_linux = b.option(bool, "skip-linux", "Main test suite skips targets with linux OS") orelse false; | 98 | const skip_linux = b.option(bool, "skip-linux", "Main test suite skips targets with linux OS") orelse false; |
| 99 | const skip_llvm = b.option(bool, "skip-llvm", "Main test suite skips targets that use LLVM backend") orelse false; | 99 | const skip_llvm = b.option(bool, "skip-llvm", "Main test suite skips targets that use LLVM backend") orelse false; |
| 100 | 100 | ||
| ... | @@ -423,7 +423,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -423,7 +423,7 @@ pub fn build(b: *std.Build) !void { |
| 423 | .skip_freebsd = skip_freebsd, | 423 | .skip_freebsd = skip_freebsd, |
| 424 | .skip_netbsd = skip_netbsd, | 424 | .skip_netbsd = skip_netbsd, |
| 425 | .skip_windows = skip_windows, | 425 | .skip_windows = skip_windows, |
| 426 | .skip_macos = skip_macos, | 426 | .skip_darwin = skip_darwin, |
| 427 | .skip_linux = skip_linux, | 427 | .skip_linux = skip_linux, |
| 428 | .skip_llvm = skip_llvm, | 428 | .skip_llvm = skip_llvm, |
| 429 | .skip_libc = skip_libc, | 429 | .skip_libc = skip_libc, |
| ... | @@ -454,7 +454,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -454,7 +454,7 @@ pub fn build(b: *std.Build) !void { |
| 454 | .skip_freebsd = skip_freebsd, | 454 | .skip_freebsd = skip_freebsd, |
| 455 | .skip_netbsd = skip_netbsd, | 455 | .skip_netbsd = skip_netbsd, |
| 456 | .skip_windows = skip_windows, | 456 | .skip_windows = skip_windows, |
| 457 | .skip_macos = skip_macos, | 457 | .skip_darwin = skip_darwin, |
| 458 | .skip_linux = skip_linux, | 458 | .skip_linux = skip_linux, |
| 459 | .skip_llvm = skip_llvm, | 459 | .skip_llvm = skip_llvm, |
| 460 | .skip_libc = skip_libc, | 460 | .skip_libc = skip_libc, |
| ... | @@ -477,7 +477,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -477,7 +477,7 @@ pub fn build(b: *std.Build) !void { |
| 477 | .skip_freebsd = skip_freebsd, | 477 | .skip_freebsd = skip_freebsd, |
| 478 | .skip_netbsd = skip_netbsd, | 478 | .skip_netbsd = skip_netbsd, |
| 479 | .skip_windows = skip_windows, | 479 | .skip_windows = skip_windows, |
| 480 | .skip_macos = skip_macos, | 480 | .skip_darwin = skip_darwin, |
| 481 | .skip_linux = skip_linux, | 481 | .skip_linux = skip_linux, |
| 482 | .skip_llvm = skip_llvm, | 482 | .skip_llvm = skip_llvm, |
| 483 | .skip_libc = true, | 483 | .skip_libc = true, |
| ... | @@ -499,7 +499,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -499,7 +499,7 @@ pub fn build(b: *std.Build) !void { |
| 499 | .skip_freebsd = skip_freebsd, | 499 | .skip_freebsd = skip_freebsd, |
| 500 | .skip_netbsd = skip_netbsd, | 500 | .skip_netbsd = skip_netbsd, |
| 501 | .skip_windows = skip_windows, | 501 | .skip_windows = skip_windows, |
| 502 | .skip_macos = skip_macos, | 502 | .skip_darwin = skip_darwin, |
| 503 | .skip_linux = skip_linux, | 503 | .skip_linux = skip_linux, |
| 504 | .skip_llvm = skip_llvm, | 504 | .skip_llvm = skip_llvm, |
| 505 | .skip_libc = true, | 505 | .skip_libc = true, |
| ... | @@ -521,7 +521,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -521,7 +521,7 @@ pub fn build(b: *std.Build) !void { |
| 521 | .skip_freebsd = skip_freebsd, | 521 | .skip_freebsd = skip_freebsd, |
| 522 | .skip_netbsd = skip_netbsd, | 522 | .skip_netbsd = skip_netbsd, |
| 523 | .skip_windows = skip_windows, | 523 | .skip_windows = skip_windows, |
| 524 | .skip_macos = skip_macos, | 524 | .skip_darwin = skip_darwin, |
| 525 | .skip_linux = skip_linux, | 525 | .skip_linux = skip_linux, |
| 526 | .skip_llvm = skip_llvm, | 526 | .skip_llvm = skip_llvm, |
| 527 | .skip_libc = skip_libc, | 527 | .skip_libc = skip_libc, |
| ... | @@ -562,7 +562,7 @@ pub fn build(b: *std.Build) !void { | ... | @@ -562,7 +562,7 @@ pub fn build(b: *std.Build) !void { |
| 562 | .skip_freebsd = skip_freebsd, | 562 | .skip_freebsd = skip_freebsd, |
| 563 | .skip_netbsd = skip_netbsd, | 563 | .skip_netbsd = skip_netbsd, |
| 564 | .skip_windows = skip_windows, | 564 | .skip_windows = skip_windows, |
| 565 | .skip_macos = skip_macos, | 565 | .skip_darwin = skip_darwin, |
| 566 | .skip_linux = skip_linux, | 566 | .skip_linux = skip_linux, |
| 567 | .skip_llvm = skip_llvm, | 567 | .skip_llvm = skip_llvm, |
| 568 | .skip_release = skip_release, | 568 | .skip_release = skip_release, |
ci/x86_64-freebsd-debug.sh+1-1
| ... | @@ -49,7 +49,7 @@ stage3-debug/bin/zig build test docs \ | ... | @@ -49,7 +49,7 @@ stage3-debug/bin/zig build test docs \ |
| 49 | -Dskip-linux \ | 49 | -Dskip-linux \ |
| 50 | -Dskip-netbsd \ | 50 | -Dskip-netbsd \ |
| 51 | -Dskip-windows \ | 51 | -Dskip-windows \ |
| 52 | -Dskip-macos \ | 52 | -Dskip-darwin \ |
| 53 | --search-prefix "$PREFIX" \ | 53 | --search-prefix "$PREFIX" \ |
| 54 | --zig-lib-dir "$PWD/../lib" \ | 54 | --zig-lib-dir "$PWD/../lib" \ |
| 55 | --test-timeout 2m | 55 | --test-timeout 2m |
ci/x86_64-freebsd-release.sh+1-1
| ... | @@ -49,7 +49,7 @@ stage3-release/bin/zig build test docs \ | ... | @@ -49,7 +49,7 @@ stage3-release/bin/zig build test docs \ |
| 49 | -Dskip-linux \ | 49 | -Dskip-linux \ |
| 50 | -Dskip-netbsd \ | 50 | -Dskip-netbsd \ |
| 51 | -Dskip-windows \ | 51 | -Dskip-windows \ |
| 52 | -Dskip-macos \ | 52 | -Dskip-darwin \ |
| 53 | --search-prefix "$PREFIX" \ | 53 | --search-prefix "$PREFIX" \ |
| 54 | --zig-lib-dir "$PWD/../lib" \ | 54 | --zig-lib-dir "$PWD/../lib" \ |
| 55 | --test-timeout 2m | 55 | --test-timeout 2m |
ci/x86_64-linux-debug-llvm.sh+1-1
| ... | @@ -57,7 +57,7 @@ stage3-debug/bin/zig build test docs \ | ... | @@ -57,7 +57,7 @@ stage3-debug/bin/zig build test docs \ |
| 57 | -Dskip-freebsd \ | 57 | -Dskip-freebsd \ |
| 58 | -Dskip-netbsd \ | 58 | -Dskip-netbsd \ |
| 59 | -Dskip-windows \ | 59 | -Dskip-windows \ |
| 60 | -Dskip-macos \ | 60 | -Dskip-darwin \ |
| 61 | -Dtarget=native-native-musl \ | 61 | -Dtarget=native-native-musl \ |
| 62 | --search-prefix "$PREFIX" \ | 62 | --search-prefix "$PREFIX" \ |
| 63 | --zig-lib-dir "$PWD/../lib" \ | 63 | --zig-lib-dir "$PWD/../lib" \ |
ci/x86_64-linux-debug.sh+1-1
| ... | @@ -56,7 +56,7 @@ stage3-debug/bin/zig build test docs \ | ... | @@ -56,7 +56,7 @@ stage3-debug/bin/zig build test docs \ |
| 56 | -Dskip-freebsd \ | 56 | -Dskip-freebsd \ |
| 57 | -Dskip-netbsd \ | 57 | -Dskip-netbsd \ |
| 58 | -Dskip-windows \ | 58 | -Dskip-windows \ |
| 59 | -Dskip-macos \ | 59 | -Dskip-darwin \ |
| 60 | -Dskip-llvm \ | 60 | -Dskip-llvm \ |
| 61 | -Dtarget=native-native-musl \ | 61 | -Dtarget=native-native-musl \ |
| 62 | --search-prefix "$PREFIX" \ | 62 | --search-prefix "$PREFIX" \ |
test/src/Cases.zig+2-2
| ... | @@ -447,7 +447,7 @@ pub const CaseTestOptions = struct { | ... | @@ -447,7 +447,7 @@ pub const CaseTestOptions = struct { |
| 447 | skip_freebsd: bool, | 447 | skip_freebsd: bool, |
| 448 | skip_netbsd: bool, | 448 | skip_netbsd: bool, |
| 449 | skip_windows: bool, | 449 | skip_windows: bool, |
| 450 | skip_macos: bool, | 450 | skip_darwin: bool, |
| 451 | skip_linux: bool, | 451 | skip_linux: bool, |
| 452 | skip_llvm: bool, | 452 | skip_llvm: bool, |
| 453 | skip_libc: bool, | 453 | skip_libc: bool, |
| ... | @@ -475,7 +475,7 @@ pub fn lowerToBuildSteps( | ... | @@ -475,7 +475,7 @@ pub fn lowerToBuildSteps( |
| 475 | if (options.skip_freebsd and case.target.query.os_tag == .freebsd) continue; | 475 | if (options.skip_freebsd and case.target.query.os_tag == .freebsd) continue; |
| 476 | if (options.skip_netbsd and case.target.query.os_tag == .netbsd) continue; | 476 | if (options.skip_netbsd and case.target.query.os_tag == .netbsd) continue; |
| 477 | if (options.skip_windows and case.target.query.os_tag == .windows) continue; | 477 | if (options.skip_windows and case.target.query.os_tag == .windows) continue; |
| 478 | if (options.skip_macos and case.target.query.os_tag == .macos) continue; | 478 | if (options.skip_darwin and case.target.query.os_tag != null and case.target.query.os_tag.?.isDarwin()) continue; |
| 479 | if (options.skip_linux and case.target.query.os_tag == .linux) continue; | 479 | if (options.skip_linux and case.target.query.os_tag == .linux) continue; |
| 480 | 480 | ||
| 481 | const would_use_llvm = @import("../tests.zig").wouldUseLlvm( | 481 | const would_use_llvm = @import("../tests.zig").wouldUseLlvm( |
test/tests.zig+4-4
| ... | @@ -2234,7 +2234,7 @@ const ModuleTestOptions = struct { | ... | @@ -2234,7 +2234,7 @@ const ModuleTestOptions = struct { |
| 2234 | skip_freebsd: bool, | 2234 | skip_freebsd: bool, |
| 2235 | skip_netbsd: bool, | 2235 | skip_netbsd: bool, |
| 2236 | skip_windows: bool, | 2236 | skip_windows: bool, |
| 2237 | skip_macos: bool, | 2237 | skip_darwin: bool, |
| 2238 | skip_linux: bool, | 2238 | skip_linux: bool, |
| 2239 | skip_llvm: bool, | 2239 | skip_llvm: bool, |
| 2240 | skip_libc: bool, | 2240 | skip_libc: bool, |
| ... | @@ -2269,7 +2269,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { | ... | @@ -2269,7 +2269,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { |
| 2269 | if (options.skip_freebsd and test_target.target.os_tag == .freebsd) continue; | 2269 | if (options.skip_freebsd and test_target.target.os_tag == .freebsd) continue; |
| 2270 | if (options.skip_netbsd and test_target.target.os_tag == .netbsd) continue; | 2270 | if (options.skip_netbsd and test_target.target.os_tag == .netbsd) continue; |
| 2271 | if (options.skip_windows and test_target.target.os_tag == .windows) continue; | 2271 | if (options.skip_windows and test_target.target.os_tag == .windows) continue; |
| 2272 | if (options.skip_macos and test_target.target.os_tag == .macos) continue; | 2272 | if (options.skip_darwin and test_target.target.os_tag != null and test_target.target.os_tag.?.isDarwin()) continue; |
| 2273 | if (options.skip_linux and test_target.target.os_tag == .linux) continue; | 2273 | if (options.skip_linux and test_target.target.os_tag == .linux) continue; |
| 2274 | 2274 | ||
| 2275 | const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode); | 2275 | const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode); |
| ... | @@ -2506,7 +2506,7 @@ const CAbiTestOptions = struct { | ... | @@ -2506,7 +2506,7 @@ const CAbiTestOptions = struct { |
| 2506 | skip_freebsd: bool, | 2506 | skip_freebsd: bool, |
| 2507 | skip_netbsd: bool, | 2507 | skip_netbsd: bool, |
| 2508 | skip_windows: bool, | 2508 | skip_windows: bool, |
| 2509 | skip_macos: bool, | 2509 | skip_darwin: bool, |
| 2510 | skip_linux: bool, | 2510 | skip_linux: bool, |
| 2511 | skip_llvm: bool, | 2511 | skip_llvm: bool, |
| 2512 | skip_release: bool, | 2512 | skip_release: bool, |
| ... | @@ -2525,7 +2525,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step { | ... | @@ -2525,7 +2525,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step { |
| 2525 | if (options.skip_freebsd and c_abi_target.target.os_tag == .freebsd) continue; | 2525 | if (options.skip_freebsd and c_abi_target.target.os_tag == .freebsd) continue; |
| 2526 | if (options.skip_netbsd and c_abi_target.target.os_tag == .netbsd) continue; | 2526 | if (options.skip_netbsd and c_abi_target.target.os_tag == .netbsd) continue; |
| 2527 | if (options.skip_windows and c_abi_target.target.os_tag == .windows) continue; | 2527 | if (options.skip_windows and c_abi_target.target.os_tag == .windows) continue; |
| 2528 | if (options.skip_macos and c_abi_target.target.os_tag == .macos) continue; | 2528 | if (options.skip_darwin and c_abi_target.target.os_tag != null and c_abi_target.target.os_tag.?.isDarwin()) continue; |
| 2529 | if (options.skip_linux and c_abi_target.target.os_tag == .linux) continue; | 2529 | if (options.skip_linux and c_abi_target.target.os_tag == .linux) continue; |
| 2530 | 2530 | ||
| 2531 | const would_use_llvm = wouldUseLlvm(c_abi_target.use_llvm, c_abi_target.target, .Debug); | 2531 | const would_use_llvm = wouldUseLlvm(c_abi_target.use_llvm, c_abi_target.target, .Debug); |