authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-08-02 10:04:54+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-08-02 13:41:58-04:00
log159cd528b164f77177e71309dee9fa79d2d5f4f4
tree364c79201b35da2319f8225e0a8138ee70ba3c4c
parent68e26a2ceea85a149cb23286504cbdcec1ae814e

Add -Denable-macos-sdk explicit flag to build.zig

This way, we can explicitly signal if a test requires the presence of macOS SDK to build. For instance, when testing our in-house MachO linker for correctly linking Objective-C, we require the presence of the SDK on the host system, and we can enforce this with `-Denable-macos-sdk` flag to `zig build test-standalone`.

5 files changed, 37 insertions(+), 9 deletions(-)

build.zig+2-1
......@@ -61,6 +61,7 @@ pub fn build(b: *Builder) !void {
6161 const omit_stage2 = b.option(bool, "omit-stage2", "Do not include stage2 behind a feature flag inside stage1") orelse false;
6262 const static_llvm = b.option(bool, "static-llvm", "Disable integration with system-installed LLVM, Clang, LLD, and libc++") orelse false;
6363 const enable_llvm = b.option(bool, "enable-llvm", "Build self-hosted compiler with LLVM backend enabled") orelse (is_stage1 or static_llvm);
64 const enable_macos_sdk = b.option(bool, "enable-macos-sdk", "Run tests requiring presence of macOS SDK and frameworks") orelse false;
6465 const config_h_path_option = b.option([]const u8, "config_h", "Path to the generated config.h");
6566
6667 if (!skip_install_lib_files) {
......@@ -340,7 +341,7 @@ pub fn build(b: *Builder) !void {
340341 ));
341342
342343 toolchain_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
343 toolchain_step.dependOn(tests.addStandaloneTests(b, test_filter, modes, skip_non_native, target));
344 toolchain_step.dependOn(tests.addStandaloneTests(b, test_filter, modes, skip_non_native, enable_macos_sdk, target));
344345 toolchain_step.dependOn(tests.addStackTraceTests(b, test_filter, modes));
345346 toolchain_step.dependOn(tests.addCliTests(b, test_filter, modes));
346347 toolchain_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, modes));
ci/azure/macos_script+1-1
......@@ -57,7 +57,7 @@ make $JOBS install
5757# TODO figure out why this causes a segmentation fault
5858# release/bin/zig test ../test/behavior.zig -fno-stage1 -fLLVM -I ../test
5959
60release/bin/zig build test-toolchain
60release/bin/zig build test-toolchain -Denable-macos-sdk
6161release/bin/zig build test-std
6262release/bin/zig build docs
6363
test/standalone.zig+1-3
......@@ -38,9 +38,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
3838 cases.addBuildFile("test/standalone/pie/build.zig", .{});
3939 }
4040 // Try to build and run an Objective-C executable.
41 if (std.Target.current.os.tag == .macos) {
42 cases.addBuildFile("test/standalone/objc/build.zig", .{ .build_modes = true });
43 }
41 cases.addBuildFile("test/standalone/objc/build.zig", .{ .build_modes = true, .requires_macos_sdk = true });
4442
4543 // Ensure the development tools are buildable.
4644 cases.add("tools/gen_spirv_spec.zig");
test/standalone/objc/build.zig+16-2
......@@ -1,5 +1,15 @@
11const std = @import("std");
22const Builder = std.build.Builder;
3const CrossTarget = std.zig.CrossTarget;
4
5fn isRunnableTarget(t: CrossTarget) bool {
6 // TODO I think we might be able to run this on Linux via Darling.
7 // Add a check for that here, and return true if Darling is available.
8 if (t.isNative() and t.getOsTag() == .macos)
9 return true
10 else
11 return false;
12}
313
414pub fn build(b: *Builder) void {
515 const mode = b.standardReleaseOptions();
......@@ -15,8 +25,12 @@ pub fn build(b: *Builder) void {
1525 exe.setBuildMode(mode);
1626 exe.setTarget(target);
1727 exe.linkLibC();
28 // TODO when we figure out how to ship framework stubs for cross-compilation,
29 // populate paths to the sysroot here.
1830 exe.linkFramework("Foundation");
1931
20 const run_cmd = exe.run();
21 test_step.dependOn(&run_cmd.step);
32 if (isRunnableTarget(target)) {
33 const run_cmd = exe.run();
34 test_step.dependOn(&run_cmd.step);
35 }
2236}
test/tests.zig+17-2
......@@ -383,7 +383,14 @@ pub fn addRuntimeSafetyTests(b: *build.Builder, test_filter: ?[]const u8, modes:
383383 return cases.step;
384384}
385385
386pub fn addStandaloneTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode, skip_non_native: bool, target: std.zig.CrossTarget) *build.Step {
386pub fn addStandaloneTests(
387 b: *build.Builder,
388 test_filter: ?[]const u8,
389 modes: []const Mode,
390 skip_non_native: bool,
391 enable_macos_sdk: bool,
392 target: std.zig.CrossTarget,
393) *build.Step {
387394 const cases = b.allocator.create(StandaloneContext) catch unreachable;
388395 cases.* = StandaloneContext{
389396 .b = b,
......@@ -392,6 +399,7 @@ pub fn addStandaloneTests(b: *build.Builder, test_filter: ?[]const u8, modes: []
392399 .test_filter = test_filter,
393400 .modes = modes,
394401 .skip_non_native = skip_non_native,
402 .enable_macos_sdk = enable_macos_sdk,
395403 .target = target,
396404 };
397405
......@@ -831,6 +839,7 @@ pub const StandaloneContext = struct {
831839 test_filter: ?[]const u8,
832840 modes: []const Mode,
833841 skip_non_native: bool,
842 enable_macos_sdk: bool,
834843 target: std.zig.CrossTarget,
835844
836845 pub fn addC(self: *StandaloneContext, root_src: []const u8) void {
......@@ -841,9 +850,15 @@ pub const StandaloneContext = struct {
841850 self.addAllArgs(root_src, false);
842851 }
843852
844 pub fn addBuildFile(self: *StandaloneContext, build_file: []const u8, features: struct { build_modes: bool = false, cross_targets: bool = false }) void {
853 pub fn addBuildFile(self: *StandaloneContext, build_file: []const u8, features: struct {
854 build_modes: bool = false,
855 cross_targets: bool = false,
856 requires_macos_sdk: bool = false,
857 }) void {
845858 const b = self.b;
846859
860 if (features.requires_macos_sdk and !self.enable_macos_sdk) return;
861
847862 const annotated_case_name = b.fmt("build {s}", .{build_file});
848863 if (self.test_filter) |filter| {
849864 if (mem.indexOf(u8, annotated_case_name, filter) == null) return;