finish test

Author: oraluben

src/auditwheel/lddtree.py

@@ -568,7 +568,7 @@ def ldd(
         if soname not in _all_libs:
             _all_libs[soname] = DynamicLibrary(soname, fullpath, realpath)
         if realpath is None:
-            log.info("Could not locate %s, skipping.", soname)
+            log.debug("Could not locate %s, skipping.", soname)
             continue
         if any(fnmatch(str(realpath), e) for e in exclude):
             log.info("Excluding %s", realpath)

tests/integration/test_manylinux.py

@@ -161,13 +161,17 @@ def repair(
         strip: bool = False,
         library_paths: list[str] | None = None,
         excludes: list[str] | None = None,
+        verbose: int = 0,
     ) -> str:
         plat = plat or self._policy
         args = []
         if library_paths:
             ld_library_path = ":".join([*library_paths, "$LD_LIBRARY_PATH"])
             args.append(f"LD_LIBRARY_PATH={ld_library_path}")
-        args.extend(["auditwheel", "repair", "-w", "/io", "--plat", plat])
+        args.append("auditwheel")
+        if verbose:
+            args.append(f"-{'v' * verbose}")
+        args.extend(["repair", "-w", "/io", "--plat", plat])
         if only_plat:
             args.append("--only-plat")
         if not isa_ext_check:
@@ -643,6 +647,10 @@ def test_dependency_order(
         policy = anylinux.policy
 
         test_path = "/auditwheel_src/tests/integration/testrpath"
+        orig_wheel = anylinux.build_wheel(test_path)
+
+        repair_output = anylinux.repair(orig_wheel, library_paths=[f"{test_path}/a"], verbose=3)
+        assert 'lddtree:Could not locate libd.so, skipping' in repair_output
 
     def test_multiple_top_level(
         self, anylinux: AnyLinuxContainer, python: PythonContainer

tests/integration/testrpath/a/a.c

@@ -1,6 +1,6 @@
 #include "b.h"
-#include "c.h"
+#include "d.h"
 
 int fa(void) {
-    return 1 + fb() + fc();
+    return 1 + fb() + fd();
 }

tests/integration/testrpath/b/b.c

@@ -1,3 +1,5 @@
+#include "d.h"
+
 int fb(void) {
-    return 10;
+    return 10 + fd();
 }

tests/integration/testrpath/c/c.h

@@ -1,3 +1,3 @@
-int fc(void) {
+int fd(void) {
     return 11;
 }

tests/integration/testrpath/c/c.c renamed to tests/integration/testrpath/d/d.c

@@ -0,0 +1 @@
+int fd(void);

tests/integration/testrpath/d/d.h

@@ -9,14 +9,16 @@
 
 class BuildExt(build_ext):
     def run(self) -> None:
-        cmd = "gcc -fPIC -shared -o c/libc.so c/c.c"
+        cmd = "gcc -fPIC -shared -o d/libd.so d/d.c"
         subprocess.check_call(cmd.split())
-        cmd = "gcc -fPIC -shared -o b/libb.so b/b.c -Ic -Lc -lc"
+        cmd = "gcc -fPIC -shared -o b/libb.so b/b.c -Id"
+        subprocess.check_call(cmd.split())
+        cmd = "patchelf --add-needed libd.so b/libb.so"
         subprocess.check_call(cmd.split())
         cmd = (
             "gcc -fPIC -shared -o a/liba.so a/a.c "
-            "-Wl,{dtags_flag} -Wl,-rpath=$ORIGIN/../b -Wl,-rpath=$ORIGIN/../c "
-            "-Ib -Lb -lb -Ic -Lc -lc"
+            "-Wl,{dtags_flag} -Wl,-rpath=$ORIGIN/../b -Wl,-rpath=$ORIGIN/../d "
+            "-Ib -Lb -lb -Id -Ld -ld"
         ).format(
             dtags_flag=(
                 "--enable-new-dtags"