Commit 9b595dd55f1ae336e2fb4e2a64334efe137dc19a | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-08-17 10:46:42+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2022-08-17 23:13:49+02:00
log	9b595dd55f1ae336e2fb4e2a64334efe137dc19a
tree	0af43c90fdb34d9d775d78428d217a93e8a07b47
parent	d84282174c449325b4bc43fed4d65289445399d4

link-test: refactor and reorg

Move common tests by target file format (Wasm, MachO) into helper
functions in `link.zig`, and sort alphabetically within for easier
tracking versus file organization on disk.

6 files changed, 47 insertions(+), 35 deletions(-)

test
- link.zig
- link
  - macho
    dead_strip
    build.zig
    pagezero
    build.zig
    search_strategy
    build.zig
    stack_size
    build.zig
    tls
    build.zig

test/link.zig+29-24

...	...	@@ -23,7 +23,12 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
23	23	.build_modes = true,
24	24	});
25	25
26		cases.addBuildFile("test/link/wasm/type/build.zig", .{
	26	addWasmCases(cases);
	27	addMachOCases(cases);
	28	}
	29
	30	fn addWasmCases(cases: *tests.StandaloneContext) void {
	31	cases.addBuildFile("test/link/wasm/bss/build.zig", .{
27	32	.build_modes = true,
28	33	.requires_stage2 = true,
29	34	});
...	...	@@ -38,23 +43,13 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
38	43	.requires_stage2 = true,
39	44	});
40	45
41		cases.addBuildFile("test/link/wasm/bss/build.zig", .{
	46	cases.addBuildFile("test/link/wasm/type/build.zig", .{
42	47	.build_modes = true,
43	48	.requires_stage2 = true,
44	49	});
	50	}
45	51
46		cases.addBuildFile("test/link/macho/entry/build.zig", .{
47		.build_modes = true,
48		});
49
50		cases.addBuildFile("test/link/macho/pagezero/build.zig", .{
51		.build_modes = false,
52		});
53
54		cases.addBuildFile("test/link/macho/dylib/build.zig", .{
55		.build_modes = true,
56		});
57
	52	fn addMachOCases(cases: *tests.StandaloneContext) void {
58	53	cases.addBuildFile("test/link/macho/dead_strip/build.zig", .{
59	54	.build_modes = false,
60	55	});
...	...	@@ -64,50 +59,60 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
64	59	.requires_macos_sdk = true,
65	60	});
66	61
67		cases.addBuildFile("test/link/macho/needed_library/build.zig", .{
	62	cases.addBuildFile("test/link/macho/dylib/build.zig", .{
68	63	.build_modes = true,
69	64	});
70	65
71		cases.addBuildFile("test/link/macho/weak_library/build.zig", .{
	66	cases.addBuildFile("test/link/macho/entry/build.zig", .{
72	67	.build_modes = true,
73	68	});
74	69
75		cases.addBuildFile("test/link/macho/needed_framework/build.zig", .{
	70	cases.addBuildFile("test/link/macho/headerpad/build.zig", .{
76	71	.build_modes = true,
77	72	.requires_macos_sdk = true,
78	73	});
79	74
80		cases.addBuildFile("test/link/macho/weak_framework/build.zig", .{
	75	cases.addBuildFile("test/link/macho/needed_framework/build.zig", .{
81	76	.build_modes = true,
82	77	.requires_macos_sdk = true,
83	78	});
84	79
85		// Try to build and run an Objective-C executable.
	80	cases.addBuildFile("test/link/macho/needed_library/build.zig", .{
	81	.build_modes = true,
	82	});
	83
86	84	cases.addBuildFile("test/link/macho/objc/build.zig", .{
87	85	.build_modes = true,
88	86	.requires_macos_sdk = true,
89	87	});
90	88
91		// Try to build and run an Objective-C++ executable.
92	89	cases.addBuildFile("test/link/macho/objcpp/build.zig", .{
93	90	.build_modes = true,
94	91	.requires_macos_sdk = true,
95	92	});
96	93
97		cases.addBuildFile("test/link/macho/stack_size/build.zig", .{
98		.build_modes = true,
	94	cases.addBuildFile("test/link/macho/pagezero/build.zig", .{
	95	.build_modes = false,
99	96	});
100	97
101	98	cases.addBuildFile("test/link/macho/search_strategy/build.zig", .{
102	99	.build_modes = true,
103	100	});
104	101
105		cases.addBuildFile("test/link/macho/headerpad/build.zig", .{
	102	cases.addBuildFile("test/link/macho/stack_size/build.zig", .{
106	103	.build_modes = true,
107		.requires_macos_sdk = true,
108	104	});
109	105
110	106	cases.addBuildFile("test/link/macho/tls/build.zig", .{
111	107	.build_modes = true,
112	108	});
	109
	110	cases.addBuildFile("test/link/macho/weak_library/build.zig", .{
	111	.build_modes = true,
	112	});
	113
	114	cases.addBuildFile("test/link/macho/weak_framework/build.zig", .{
	115	.build_modes = true,
	116	.requires_macos_sdk = true,
	117	});
113	118	}

test/link/macho/dead_strip/build.zig+5-3

...	...	@@ -4,13 +4,14 @@ const LibExeObjectStep = std.build.LibExeObjStep;
4	4
5	5	pub fn build(b: *Builder) void {
6	6	const mode = b.standardReleaseOptions();
	7	const target: std.zig.CrossTarget = .{ .os_tag = .macos };
7	8
8	9	const test_step = b.step("test", "Test the program");
9	10	test_step.dependOn(b.getInstallStep());
10	11
11	12	{
12	13	// Without -dead_strip, we expect `iAmUnused` symbol present
13		const exe = createScenario(b, mode);
	14	const exe = createScenario(b, mode, target);
14	15
15	16	const check = exe.checkObject(.macho);
16	17	check.checkInSymtab();
...	...	@@ -23,7 +24,7 @@ pub fn build(b: *Builder) void {
23	24
24	25	{
25	26	// With -dead_strip, no `iAmUnused` symbol should be present
26		const exe = createScenario(b, mode);
	27	const exe = createScenario(b, mode, target);
27	28	exe.link_gc_sections = true;
28	29
29	30	const check = exe.checkObject(.macho);
...	...	@@ -36,10 +37,11 @@ pub fn build(b: *Builder) void {
36	37	}
37	38	}
38	39
39		fn createScenario(b: Builder, mode: std.builtin.Mode) LibExeObjectStep {
	40	fn createScenario(b: Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) LibExeObjectStep {
40	41	const exe = b.addExecutable("test", null);
41	42	exe.addCSourceFile("main.c", &[0][]const u8{});
42	43	exe.setBuildMode(mode);
	44	exe.setTarget(target);
43	45	exe.linkLibC();
44	46	return exe;
45	47	}

test/link/macho/pagezero/build.zig+3-2

...	...	@@ -3,13 +3,14 @@ const Builder = std.build.Builder;
3	3
4	4	pub fn build(b: *Builder) void {
5	5	const mode = b.standardReleaseOptions();
	6	const target: std.zig.CrossTarget = .{ .os_tag = .macos };
6	7
7	8	const test_step = b.step("test", "Test");
8	9	test_step.dependOn(b.getInstallStep());
9	10
10	11	{
11	12	const exe = b.addExecutable("pagezero", null);
12		exe.setTarget(.{ .os_tag = .macos });
	13	exe.setTarget(target);
13	14	exe.setBuildMode(mode);
14	15	exe.addCSourceFile("main.c", &.{});
15	16	exe.linkLibC();
...	...	@@ -29,7 +30,7 @@ pub fn build(b: *Builder) void {
29	30
30	31	{
31	32	const exe = b.addExecutable("no_pagezero", null);
32		exe.setTarget(.{ .os_tag = .macos });
	33	exe.setTarget(target);
33	34	exe.setBuildMode(mode);
34	35	exe.addCSourceFile("main.c", &.{});
35	36	exe.linkLibC();

test/link/macho/search_strategy/build.zig+4-4

...	...	@@ -1,17 +1,17 @@
1	1	const std = @import("std");
2	2	const Builder = std.build.Builder;
3	3	const LibExeObjectStep = std.build.LibExeObjStep;
4		const target: std.zig.CrossTarget = .{ .os_tag = .macos };
5	4
6	5	pub fn build(b: *Builder) void {
7	6	const mode = b.standardReleaseOptions();
	7	const target: std.zig.CrossTarget = .{ .os_tag = .macos };
8	8
9	9	const test_step = b.step("test", "Test");
10	10	test_step.dependOn(b.getInstallStep());
11	11
12	12	{
13	13	// -search_dylibs_first
14		const exe = createScenario(b, mode);
	14	const exe = createScenario(b, mode, target);
15	15	exe.search_strategy = .dylibs_first;
16	16
17	17	const check = exe.checkObject(.macho);
...	...	@@ -26,7 +26,7 @@ pub fn build(b: *Builder) void {
26	26
27	27	{
28	28	// -search_paths_first
29		const exe = createScenario(b, mode);
	29	const exe = createScenario(b, mode, target);
30	30	exe.search_strategy = .paths_first;
31	31
32	32	const run = std.build.EmulatableRunStep.create(b, "run", exe);
...	...	@@ -36,7 +36,7 @@ pub fn build(b: *Builder) void {
36	36	}
37	37	}
38	38
39		fn createScenario(b: Builder, mode: std.builtin.Mode) LibExeObjectStep {
	39	fn createScenario(b: Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) LibExeObjectStep {
40	40	const static = b.addStaticLibrary("a", null);
41	41	static.setTarget(target);
42	42	static.setBuildMode(mode);

test/link/macho/stack_size/build.zig+2-1

...	...	@@ -3,12 +3,13 @@ const Builder = std.build.Builder;
3	3
4	4	pub fn build(b: *Builder) void {
5	5	const mode = b.standardReleaseOptions();
	6	const target: std.zig.CrossTarget = .{ .os_tag = .macos };
6	7
7	8	const test_step = b.step("test", "Test");
8	9	test_step.dependOn(b.getInstallStep());
9	10
10	11	const exe = b.addExecutable("main", null);
11		exe.setTarget(.{ .os_tag = .macos });
	12	exe.setTarget(target);
12	13	exe.setBuildMode(mode);
13	14	exe.addCSourceFile("main.c", &.{});
14	15	exe.linkLibC();

test/link/macho/tls/build.zig+4-1

...	...	@@ -1,4 +1,5 @@
1		const Builder = @import("std").build.Builder;
	1	const std = @import("std");
	2	const Builder = std.build.Builder;
2	3
3	4	pub fn build(b: *Builder) void {
4	5	const mode = b.standardReleaseOptions();
...	...	@@ -6,11 +7,13 @@ pub fn build(b: *Builder) void {
6	7
7	8	const lib = b.addSharedLibrary("a", null, b.version(1, 0, 0));
8	9	lib.setBuildMode(mode);
	10	lib.setTarget(target);
9	11	lib.addCSourceFile("a.c", &.{});
10	12	lib.linkLibC();
11	13
12	14	const test_exe = b.addTest("main.zig");
13	15	test_exe.setBuildMode(mode);
	16	test_exe.setTarget(target);
14	17	test_exe.linkLibrary(lib);
15	18	test_exe.linkLibC();
16	19