authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-11-14 22:39:12+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-11-15 14:23:34+01:00
logbbdf8eaf75d651fe26da2cd59bd2ee8795a0d556
treee3be4beb9b8fcf5445b3771998e7375808447722
parent3649aeb42602d0c24008a49b304b8bfc361dd4a2
signaturebadge-check 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 {
9494 const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false;
9595 const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false;
9696 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;
9898 const skip_linux = b.option(bool, "skip-linux", "Main test suite skips targets with linux OS") orelse false;
9999 const skip_llvm = b.option(bool, "skip-llvm", "Main test suite skips targets that use LLVM backend") orelse false;
100100
......@@ -423,7 +423,7 @@ pub fn build(b: *std.Build) !void {
423423 .skip_freebsd = skip_freebsd,
424424 .skip_netbsd = skip_netbsd,
425425 .skip_windows = skip_windows,
426 .skip_macos = skip_macos,
426 .skip_darwin = skip_darwin,
427427 .skip_linux = skip_linux,
428428 .skip_llvm = skip_llvm,
429429 .skip_libc = skip_libc,
......@@ -454,7 +454,7 @@ pub fn build(b: *std.Build) !void {
454454 .skip_freebsd = skip_freebsd,
455455 .skip_netbsd = skip_netbsd,
456456 .skip_windows = skip_windows,
457 .skip_macos = skip_macos,
457 .skip_darwin = skip_darwin,
458458 .skip_linux = skip_linux,
459459 .skip_llvm = skip_llvm,
460460 .skip_libc = skip_libc,
......@@ -477,7 +477,7 @@ pub fn build(b: *std.Build) !void {
477477 .skip_freebsd = skip_freebsd,
478478 .skip_netbsd = skip_netbsd,
479479 .skip_windows = skip_windows,
480 .skip_macos = skip_macos,
480 .skip_darwin = skip_darwin,
481481 .skip_linux = skip_linux,
482482 .skip_llvm = skip_llvm,
483483 .skip_libc = true,
......@@ -499,7 +499,7 @@ pub fn build(b: *std.Build) !void {
499499 .skip_freebsd = skip_freebsd,
500500 .skip_netbsd = skip_netbsd,
501501 .skip_windows = skip_windows,
502 .skip_macos = skip_macos,
502 .skip_darwin = skip_darwin,
503503 .skip_linux = skip_linux,
504504 .skip_llvm = skip_llvm,
505505 .skip_libc = true,
......@@ -521,7 +521,7 @@ pub fn build(b: *std.Build) !void {
521521 .skip_freebsd = skip_freebsd,
522522 .skip_netbsd = skip_netbsd,
523523 .skip_windows = skip_windows,
524 .skip_macos = skip_macos,
524 .skip_darwin = skip_darwin,
525525 .skip_linux = skip_linux,
526526 .skip_llvm = skip_llvm,
527527 .skip_libc = skip_libc,
......@@ -562,7 +562,7 @@ pub fn build(b: *std.Build) !void {
562562 .skip_freebsd = skip_freebsd,
563563 .skip_netbsd = skip_netbsd,
564564 .skip_windows = skip_windows,
565 .skip_macos = skip_macos,
565 .skip_darwin = skip_darwin,
566566 .skip_linux = skip_linux,
567567 .skip_llvm = skip_llvm,
568568 .skip_release = skip_release,
ci/x86_64-freebsd-debug.sh+1-1
......@@ -49,7 +49,7 @@ stage3-debug/bin/zig build test docs \
4949 -Dskip-linux \
5050 -Dskip-netbsd \
5151 -Dskip-windows \
52 -Dskip-macos \
52 -Dskip-darwin \
5353 --search-prefix "$PREFIX" \
5454 --zig-lib-dir "$PWD/../lib" \
5555 --test-timeout 2m
ci/x86_64-freebsd-release.sh+1-1
......@@ -49,7 +49,7 @@ stage3-release/bin/zig build test docs \
4949 -Dskip-linux \
5050 -Dskip-netbsd \
5151 -Dskip-windows \
52 -Dskip-macos \
52 -Dskip-darwin \
5353 --search-prefix "$PREFIX" \
5454 --zig-lib-dir "$PWD/../lib" \
5555 --test-timeout 2m
ci/x86_64-linux-debug-llvm.sh+1-1
......@@ -57,7 +57,7 @@ stage3-debug/bin/zig build test docs \
5757 -Dskip-freebsd \
5858 -Dskip-netbsd \
5959 -Dskip-windows \
60 -Dskip-macos \
60 -Dskip-darwin \
6161 -Dtarget=native-native-musl \
6262 --search-prefix "$PREFIX" \
6363 --zig-lib-dir "$PWD/../lib" \
ci/x86_64-linux-debug.sh+1-1
......@@ -56,7 +56,7 @@ stage3-debug/bin/zig build test docs \
5656 -Dskip-freebsd \
5757 -Dskip-netbsd \
5858 -Dskip-windows \
59 -Dskip-macos \
59 -Dskip-darwin \
6060 -Dskip-llvm \
6161 -Dtarget=native-native-musl \
6262 --search-prefix "$PREFIX" \
test/src/Cases.zig+2-2
......@@ -447,7 +447,7 @@ pub const CaseTestOptions = struct {
447447 skip_freebsd: bool,
448448 skip_netbsd: bool,
449449 skip_windows: bool,
450 skip_macos: bool,
450 skip_darwin: bool,
451451 skip_linux: bool,
452452 skip_llvm: bool,
453453 skip_libc: bool,
......@@ -475,7 +475,7 @@ pub fn lowerToBuildSteps(
475475 if (options.skip_freebsd and case.target.query.os_tag == .freebsd) continue;
476476 if (options.skip_netbsd and case.target.query.os_tag == .netbsd) continue;
477477 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;
479479 if (options.skip_linux and case.target.query.os_tag == .linux) continue;
480480
481481 const would_use_llvm = @import("../tests.zig").wouldUseLlvm(
test/tests.zig+4-4
......@@ -2234,7 +2234,7 @@ const ModuleTestOptions = struct {
22342234 skip_freebsd: bool,
22352235 skip_netbsd: bool,
22362236 skip_windows: bool,
2237 skip_macos: bool,
2237 skip_darwin: bool,
22382238 skip_linux: bool,
22392239 skip_llvm: bool,
22402240 skip_libc: bool,
......@@ -2269,7 +2269,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
22692269 if (options.skip_freebsd and test_target.target.os_tag == .freebsd) continue;
22702270 if (options.skip_netbsd and test_target.target.os_tag == .netbsd) continue;
22712271 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;
22732273 if (options.skip_linux and test_target.target.os_tag == .linux) continue;
22742274
22752275 const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode);
......@@ -2506,7 +2506,7 @@ const CAbiTestOptions = struct {
25062506 skip_freebsd: bool,
25072507 skip_netbsd: bool,
25082508 skip_windows: bool,
2509 skip_macos: bool,
2509 skip_darwin: bool,
25102510 skip_linux: bool,
25112511 skip_llvm: bool,
25122512 skip_release: bool,
......@@ -2525,7 +2525,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step {
25252525 if (options.skip_freebsd and c_abi_target.target.os_tag == .freebsd) continue;
25262526 if (options.skip_netbsd and c_abi_target.target.os_tag == .netbsd) continue;
25272527 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;
25292529 if (options.skip_linux and c_abi_target.target.os_tag == .linux) continue;
25302530
25312531 const would_use_llvm = wouldUseLlvm(c_abi_target.use_llvm, c_abi_target.target, .Debug);