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 {
8585 elf_step.dependOn(testTlsDso(b, .{ .target = glibc_target }));
8686 elf_step.dependOn(testTlsGd(b, .{ .target = glibc_target }));
8787 elf_step.dependOn(testTlsGdNoPlt(b, .{ .target = glibc_target }));
88 // https://github.com/ziglang/zig/issues/17576
89 //elf_step.dependOn(testTlsGdToIe(b, .{ .target = glibc_target }));
88 elf_step.dependOn(testTlsGdToIe(b, .{ .target = glibc_target }));
9089 elf_step.dependOn(testTlsIe(b, .{ .target = glibc_target }));
9190 elf_step.dependOn(testTlsLargeAlignment(b, .{ .target = glibc_target }));
9291 elf_step.dependOn(testTlsLargeTbss(b, .{ .target = glibc_target }));
9392 elf_step.dependOn(testTlsLargeStaticImage(b, .{ .target = glibc_target }));
94 // https://github.com/ziglang/zig/issues/17576
95 //elf_step.dependOn(testTlsLd(b, .{ .target = glibc_target }));
93 elf_step.dependOn(testTlsLd(b, .{ .target = glibc_target }));
9694 elf_step.dependOn(testTlsLdDso(b, .{ .target = glibc_target }));
97 // https://github.com/ziglang/zig/issues/17576
98 //elf_step.dependOn(testTlsLdNoPlt(b, .{ .target = glibc_target }));
95 elf_step.dependOn(testTlsLdNoPlt(b, .{ .target = glibc_target }));
9996 // https://github.com/ziglang/zig/issues/17430
10097 // elf_step.dependOn(testTlsNoPic(b, .{ .target = glibc_target }));
10198 elf_step.dependOn(testTlsOffsetAlignment(b, .{ .target = glibc_target }));
......@@ -2113,10 +2110,10 @@ fn testTlsGdToIe(b: *Build, opts: Options) *Step {
21132110 b_o.force_pic = true;
21142111
21152112 {
2116 const dso = addSharedLibrary(b, "a", opts);
2113 const dso = addSharedLibrary(b, "a1", opts);
21172114 dso.addObject(a_o);
21182115
2119 const exe = addExecutable(b, "main", opts);
2116 const exe = addExecutable(b, "main1", opts);
21202117 exe.addObject(b_o);
21212118 exe.linkLibrary(dso);
21222119 exe.linkLibC();
......@@ -2127,11 +2124,11 @@ fn testTlsGdToIe(b: *Build, opts: Options) *Step {
21272124 }
21282125
21292126 {
2130 const dso = addSharedLibrary(b, "a", opts);
2127 const dso = addSharedLibrary(b, "a2", opts);
21312128 dso.addObject(a_o);
21322129 // dso.link_relax = false; // TODO
21332130
2134 const exe = addExecutable(b, "main", opts);
2131 const exe = addExecutable(b, "main2", opts);
21352132 exe.addObject(b_o);
21362133 exe.linkLibrary(dso);
21372134 exe.linkLibC();
......@@ -2210,7 +2207,7 @@ fn testTlsIe(b: *Build, opts: Options) *Step {
22102207 const exp_stdout = "0 0 3 5 7\n";
22112208
22122209 {
2213 const exe = addExecutable(b, "main", opts);
2210 const exe = addExecutable(b, "main1", opts);
22142211 exe.addObject(main_o);
22152212 exe.linkLibrary(dso);
22162213 exe.linkLibC();
......@@ -2221,7 +2218,7 @@ fn testTlsIe(b: *Build, opts: Options) *Step {
22212218 }
22222219
22232220 {
2224 const exe = addExecutable(b, "main", opts);
2221 const exe = addExecutable(b, "main2", opts);
22252222 exe.addObject(main_o);
22262223 exe.linkLibrary(dso);
22272224 exe.linkLibC();
......@@ -2374,7 +2371,7 @@ fn testTlsLd(b: *Build, opts: Options) *Step {
23742371 const exp_stdout = "3 5 3 5\n";
23752372
23762373 {
2377 const exe = addExecutable(b, "main", opts);
2374 const exe = addExecutable(b, "main1", opts);
23782375 exe.addObject(main_o);
23792376 exe.addObject(a_o);
23802377 exe.linkLibC();
......@@ -2385,7 +2382,7 @@ fn testTlsLd(b: *Build, opts: Options) *Step {
23852382 }
23862383
23872384 {
2388 const exe = addExecutable(b, "main", opts);
2385 const exe = addExecutable(b, "main2", opts);
23892386 exe.addObject(main_o);
23902387 exe.addObject(a_o);
23912388 exe.linkLibC();
......@@ -2456,7 +2453,7 @@ fn testTlsLdNoPlt(b: *Build, opts: Options) *Step {
24562453 b_o.force_pic = true;
24572454
24582455 {
2459 const exe = addExecutable(b, "main", opts);
2456 const exe = addExecutable(b, "main1", opts);
24602457 exe.addObject(a_o);
24612458 exe.addObject(b_o);
24622459 exe.linkLibC();
......@@ -2467,7 +2464,7 @@ fn testTlsLdNoPlt(b: *Build, opts: Options) *Step {
24672464 }
24682465
24692466 {
2470 const exe = addExecutable(b, "main", opts);
2467 const exe = addExecutable(b, "main2", opts);
24712468 exe.addObject(a_o);
24722469 exe.addObject(b_o);
24732470 exe.linkLibC();