Improve filename mapping

Author: mdboom

ci/tools/abicheck.py

@@ -21,7 +21,8 @@ def get_package_path(package_name):
 def regenerate(build_dir, abi_dir):
     for so_path in Path(build_dir).glob("**/*.so"):
         print(f"Generating ABI from {so_path.relative_to(build_dir)}")
-        abi_path = abi_dir / so_path.relative_to(build_dir).with_suffix(".abi")
+        abi_name = so_path.stem[: so_path.stem.find(".")] + ".abi"
+        abi_path = abi_dir / so_path.parent.relative_to(build_dir) / abi_name
         abi_path.parent.mkdir(parents=True, exist_ok=True)
         subprocess.run(["abidw", so_path, "--no-architecture", "--out-file", abi_path], check=True)
 
@@ -30,8 +31,9 @@ def check(build_dir, abi_dir):
     found_failures = []
     missing_so = []
     for abi_path in Path(abi_dir).glob("**/*.abi"):
-        so_path = Path(build_dir) / abi_path.relative_to(abi_dir).with_suffix(".so")
-        if so_path.exists():
+        so_candidates = list((Path(build_dir) / abi_path.parent.relative_to(abi_dir)).glob(f"{abi_path.stem}.*.so"))
+        if len(so_candidates) == 1:
+            so_path = so_candidates[0]
             proc = subprocess.run(
                 [
                     "abidiff",
@@ -44,8 +46,13 @@ def check(build_dir, abi_dir):
             )
             if proc.returncode != 0:
                 found_failures.append(so_path)
+        elif len(so_candidates) == 0:
+            missing_so.append(abi_path)
         else:
-            missing_so.append(so_path)
+            print(f"Multiple .so candidates found for {abi_path}:")
+            for p in so_candidates:
+                print(f"  {p}")
+            missing_so.append(abi_path)
 
     if len(found_failures):
         print("ABI differences found in the following files:")
@@ -55,7 +62,7 @@ def check(build_dir, abi_dir):
     if len(missing_so):
         print("Expected .so file(s) have been removed:")
         for p in missing_so:
-            print(f"  {p.relative_to(build_dir)}")
+            print(f"  {p.relative_to(abi_dir)}")
 
     return len(found_failures) or len(missing_so)