authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-10-18 10:23:27+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-10-19 03:34:47+02:00
log1bbe521074727e0ac474413aa23fa1f6121c577c
tree3592d5bad382d9cad6ba54cc9b57039aa88ab888
parent32bc077672cc3d7c468b4531c52d160ee12fb89f

elf: fix flaky link tests

1 files changed, 13 insertions(+), 16 deletions(-)

test/link/elf.zig+13-16
...@@ -85,17 +85,14 @@ pub fn build(b: *Build) void {...@@ -85,17 +85,14 @@ pub fn build(b: *Build) void {
85 elf_step.dependOn(testTlsDso(b, .{ .target = glibc_target }));85 elf_step.dependOn(testTlsDso(b, .{ .target = glibc_target }));
86 elf_step.dependOn(testTlsGd(b, .{ .target = glibc_target }));86 elf_step.dependOn(testTlsGd(b, .{ .target = glibc_target }));
87 elf_step.dependOn(testTlsGdNoPlt(b, .{ .target = glibc_target }));87 elf_step.dependOn(testTlsGdNoPlt(b, .{ .target = glibc_target }));
88 // https://github.com/ziglang/zig/issues/1757688 elf_step.dependOn(testTlsGdToIe(b, .{ .target = glibc_target }));
89 //elf_step.dependOn(testTlsGdToIe(b, .{ .target = glibc_target }));
90 elf_step.dependOn(testTlsIe(b, .{ .target = glibc_target }));89 elf_step.dependOn(testTlsIe(b, .{ .target = glibc_target }));
91 elf_step.dependOn(testTlsLargeAlignment(b, .{ .target = glibc_target }));90 elf_step.dependOn(testTlsLargeAlignment(b, .{ .target = glibc_target }));
92 elf_step.dependOn(testTlsLargeTbss(b, .{ .target = glibc_target }));91 elf_step.dependOn(testTlsLargeTbss(b, .{ .target = glibc_target }));
93 elf_step.dependOn(testTlsLargeStaticImage(b, .{ .target = glibc_target }));92 elf_step.dependOn(testTlsLargeStaticImage(b, .{ .target = glibc_target }));
94 // https://github.com/ziglang/zig/issues/1757693 elf_step.dependOn(testTlsLd(b, .{ .target = glibc_target }));
95 //elf_step.dependOn(testTlsLd(b, .{ .target = glibc_target }));
96 elf_step.dependOn(testTlsLdDso(b, .{ .target = glibc_target }));94 elf_step.dependOn(testTlsLdDso(b, .{ .target = glibc_target }));
97 // https://github.com/ziglang/zig/issues/1757695 elf_step.dependOn(testTlsLdNoPlt(b, .{ .target = glibc_target }));
98 //elf_step.dependOn(testTlsLdNoPlt(b, .{ .target = glibc_target }));
99 // https://github.com/ziglang/zig/issues/1743096 // https://github.com/ziglang/zig/issues/17430
100 // elf_step.dependOn(testTlsNoPic(b, .{ .target = glibc_target }));97 // elf_step.dependOn(testTlsNoPic(b, .{ .target = glibc_target }));
101 elf_step.dependOn(testTlsOffsetAlignment(b, .{ .target = glibc_target }));98 elf_step.dependOn(testTlsOffsetAlignment(b, .{ .target = glibc_target }));
...@@ -2113,10 +2110,10 @@ fn testTlsGdToIe(b: *Build, opts: Options) *Step {...@@ -2113,10 +2110,10 @@ fn testTlsGdToIe(b: *Build, opts: Options) *Step {
2113 b_o.force_pic = true;2110 b_o.force_pic = true;
21142111
2115 {2112 {
2116 const dso = addSharedLibrary(b, "a", opts);2113 const dso = addSharedLibrary(b, "a1", opts);
2117 dso.addObject(a_o);2114 dso.addObject(a_o);
21182115
2119 const exe = addExecutable(b, "main", opts);2116 const exe = addExecutable(b, "main1", opts);
2120 exe.addObject(b_o);2117 exe.addObject(b_o);
2121 exe.linkLibrary(dso);2118 exe.linkLibrary(dso);
2122 exe.linkLibC();2119 exe.linkLibC();
...@@ -2127,11 +2124,11 @@ fn testTlsGdToIe(b: *Build, opts: Options) *Step {...@@ -2127,11 +2124,11 @@ fn testTlsGdToIe(b: *Build, opts: Options) *Step {
2127 }2124 }
21282125
2129 {2126 {
2130 const dso = addSharedLibrary(b, "a", opts);2127 const dso = addSharedLibrary(b, "a2", opts);
2131 dso.addObject(a_o);2128 dso.addObject(a_o);
2132 // dso.link_relax = false; // TODO2129 // dso.link_relax = false; // TODO
21332130
2134 const exe = addExecutable(b, "main", opts);2131 const exe = addExecutable(b, "main2", opts);
2135 exe.addObject(b_o);2132 exe.addObject(b_o);
2136 exe.linkLibrary(dso);2133 exe.linkLibrary(dso);
2137 exe.linkLibC();2134 exe.linkLibC();
...@@ -2210,7 +2207,7 @@ fn testTlsIe(b: *Build, opts: Options) *Step {...@@ -2210,7 +2207,7 @@ fn testTlsIe(b: *Build, opts: Options) *Step {
2210 const exp_stdout = "0 0 3 5 7\n";2207 const exp_stdout = "0 0 3 5 7\n";
22112208
2212 {2209 {
2213 const exe = addExecutable(b, "main", opts);2210 const exe = addExecutable(b, "main1", opts);
2214 exe.addObject(main_o);2211 exe.addObject(main_o);
2215 exe.linkLibrary(dso);2212 exe.linkLibrary(dso);
2216 exe.linkLibC();2213 exe.linkLibC();
...@@ -2221,7 +2218,7 @@ fn testTlsIe(b: *Build, opts: Options) *Step {...@@ -2221,7 +2218,7 @@ fn testTlsIe(b: *Build, opts: Options) *Step {
2221 }2218 }
22222219
2223 {2220 {
2224 const exe = addExecutable(b, "main", opts);2221 const exe = addExecutable(b, "main2", opts);
2225 exe.addObject(main_o);2222 exe.addObject(main_o);
2226 exe.linkLibrary(dso);2223 exe.linkLibrary(dso);
2227 exe.linkLibC();2224 exe.linkLibC();
...@@ -2374,7 +2371,7 @@ fn testTlsLd(b: *Build, opts: Options) *Step {...@@ -2374,7 +2371,7 @@ fn testTlsLd(b: *Build, opts: Options) *Step {
2374 const exp_stdout = "3 5 3 5\n";2371 const exp_stdout = "3 5 3 5\n";
23752372
2376 {2373 {
2377 const exe = addExecutable(b, "main", opts);2374 const exe = addExecutable(b, "main1", opts);
2378 exe.addObject(main_o);2375 exe.addObject(main_o);
2379 exe.addObject(a_o);2376 exe.addObject(a_o);
2380 exe.linkLibC();2377 exe.linkLibC();
...@@ -2385,7 +2382,7 @@ fn testTlsLd(b: *Build, opts: Options) *Step {...@@ -2385,7 +2382,7 @@ fn testTlsLd(b: *Build, opts: Options) *Step {
2385 }2382 }
23862383
2387 {2384 {
2388 const exe = addExecutable(b, "main", opts);2385 const exe = addExecutable(b, "main2", opts);
2389 exe.addObject(main_o);2386 exe.addObject(main_o);
2390 exe.addObject(a_o);2387 exe.addObject(a_o);
2391 exe.linkLibC();2388 exe.linkLibC();
...@@ -2456,7 +2453,7 @@ fn testTlsLdNoPlt(b: *Build, opts: Options) *Step {...@@ -2456,7 +2453,7 @@ fn testTlsLdNoPlt(b: *Build, opts: Options) *Step {
2456 b_o.force_pic = true;2453 b_o.force_pic = true;
24572454
2458 {2455 {
2459 const exe = addExecutable(b, "main", opts);2456 const exe = addExecutable(b, "main1", opts);
2460 exe.addObject(a_o);2457 exe.addObject(a_o);
2461 exe.addObject(b_o);2458 exe.addObject(b_o);
2462 exe.linkLibC();2459 exe.linkLibC();
...@@ -2467,7 +2464,7 @@ fn testTlsLdNoPlt(b: *Build, opts: Options) *Step {...@@ -2467,7 +2464,7 @@ fn testTlsLdNoPlt(b: *Build, opts: Options) *Step {
2467 }2464 }
24682465
2469 {2466 {
2470 const exe = addExecutable(b, "main", opts);2467 const exe = addExecutable(b, "main2", opts);
2471 exe.addObject(a_o);2468 exe.addObject(a_o);
2472 exe.addObject(b_o);2469 exe.addObject(b_o);
2473 exe.linkLibC();2470 exe.linkLibC();