Move the -l/-L ELF flag forwarding test

Author: a-khabarov

test/link/elf.zig

@@ -82,6 +82,7 @@ pub fn testAll(b: *Build, build_opts: BuildOptions) *Step {
 
         // glibc tests
         elf_step.dependOn(testAsNeeded(b, .{ .target = gnu_target }));
+        elf_step.dependOn(testLibraryPathsCompatibility(b, .{ .target = gnu_target, .use_lld = true }));
         // https://github.com/ziglang/zig/issues/17430
         // elf_step.dependOn(testCanonicalPlt(b, .{ .target = gnu_target }));
         elf_step.dependOn(testCommentString(b, .{ .target = gnu_target }));
@@ -308,6 +309,54 @@ fn testAsNeeded(b: *Build, opts: Options) *Step {
     return test_step;
 }
 
+fn testLibraryPathsCompatibility(b: *Build, opts: Options) *Step {
+    const test_step = addTestStep(b, "library-paths-compatibility", opts);
+
+    const main_o = addObject(b, opts, .{
+        .name = "main",
+        .c_source_bytes =
+        \\#include <stdio.h>
+        \\int foo();
+        \\int main() {
+        \\  printf("%d\n", foo());
+        \\  return 0;
+        \\}
+        \\
+        ,
+    });
+    main_o.linkLibC();
+
+    const libfoo = addSharedLibrary(b, opts, .{ .name = "foo", .omit_soname = true });
+    addCSourceBytes(libfoo, "int foo() { return 42; }", &.{});
+
+    {
+        const scripts = WriteFile.create(b);
+        const path = scripts.addCopyFile(libfoo.getEmittedBin(), "foo/libfoo.so");
+
+        const exe = addExecutable(b, opts, .{ .name = "test" });
+        exe.addObject(main_o);
+
+        exe.setCwd(scripts.getDirectory());
+        exe.addLibraryPathSpecial("foo");
+        exe.addRPath(path.dirname());
+
+        exe.linkSystemLibrary2("foo", .{ .needed = false });
+        exe.linkLibC();
+
+        const run = addRunArtifact(exe);
+        run.expectStdOutEqual("42\n");
+        test_step.dependOn(&run.step);
+
+        const check = exe.checkObject();
+        check.checkInDynamicSection();
+        check.checkExact("NEEDED libfoo.so");
+        check.checkNotPresent("NEEDED foo/libfoo.so");
+        test_step.dependOn(&check.step);
+    }
+
+    return test_step;
+}
+
 fn testCanonicalPlt(b: *Build, opts: Options) *Step {
     const test_step = addTestStep(b, "canonical-plt", opts);
 

test/tests.zig

@@ -779,54 +779,6 @@ pub fn addCliTests(b: *std.Build) *Step {
         step.dependOn(&cleanup.step);
     }
 
-    {
-        // Test `zig cc` `-l`/`-L` linker flag forwarding for ELF.
-        const tmp_path = b.makeTempPath();
-        var dir = std.fs.cwd().openDir(tmp_path, .{}) catch @panic("unhandled");
-        defer dir.close();
-        dir.writeFile("main.c",
-            \\#include "foo/foo.h"
-            \\int main() { f(); }
-        ) catch @panic("unhandled");
-        dir.makeDir("foo") catch @panic("unhandled");
-        var subdir = dir.openDir("foo", .{}) catch @panic("unhandled");
-        defer subdir.close();
-        subdir.writeFile("foo.h", "void f();") catch @panic("unhandled");
-        subdir.writeFile("foo.c", "void f() {}") catch @panic("unhandled");
-
-        const cc_shared = b.addSystemCommand(&.{
-            b.graph.zig_exe, "cc",
-            "-shared",       "foo/foo.c",
-            "-target",       "x86_64-linux-gnu",
-            "-o",            "foo/libfoo.so",
-        });
-        cc_shared.setCwd(.{ .cwd_relative = tmp_path });
-        cc_shared.setName("build the shared library");
-
-        const cc_link = b.addSystemCommand(&.{
-            b.graph.zig_exe,    "cc",
-            "main.c",           "-Lfoo",
-            "-lfoo",            "-target",
-            "x86_64-linux-gnu", "-o",
-            "main",
-        });
-        const main_path = std.fs.path.join(b.allocator, &.{ tmp_path, "main" }) catch @panic("OOM");
-        cc_link.setCwd(.{ .cwd_relative = tmp_path });
-        cc_link.setName("link the shared library");
-        cc_link.step.dependOn(&cc_shared.step);
-
-        const check = Step.CheckObject.create(step.owner, .{ .cwd_relative = main_path }, .elf);
-        check.checkInDynamicSection();
-        check.checkExact("NEEDED libfoo.so");
-        check.checkNotPresent("NEEDED foo/libfoo.so");
-        check.step.dependOn(&cc_link.step);
-
-        const cleanup = b.addRemoveDirTree(tmp_path);
-        cleanup.step.dependOn(&check.step);
-
-        step.dependOn(&cleanup.step);
-    }
-
     // Test Godbolt API
     if (builtin.os.tag == .linux and builtin.cpu.arch == .x86_64) {
         const tmp_path = b.makeTempPath();