Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tools/import_audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,12 +724,19 @@ def system_library(name):
if name:
for suffix in (".sprx", ".suprx", ".debug_prx"):
if name.endswith(suffix):
normalized = name.removesuffix(suffix) + ".prx"
normalized = name[:-len(suffix)] + ".prx"
candidates = windows_names.get(normalized.casefold(), ())
if normalized in candidates:
return normalized
if len(candidates) == 1:
return next(iter(candidates))
if name.casefold().endswith(".prx"):
normalized = name[:-4] + ".prx"
candidates = windows_names.get(normalized.casefold(), ())
if normalized in candidates:
return normalized
if len(candidates) == 1:
return next(iter(candidates))
return name

def available(name):
Expand Down
19 changes: 19 additions & 0 deletions tools/tests/test_import_audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,25 @@ def test_windows_suffix_lookup_matches_provider_case_insensitively(self):
self.assertEqual(data["library_mismatch"], 0)
self.assertEqual(data["imports"][0]["providers"], ["LibSceA.prx"])

def test_windows_prx_suffix_lookup_folds_the_suffix_case(self):
work = self.work
(work.libs / "LibSceA.prx").write_bytes(build_pe(["AAAAAAAAAAA"]))
registry, result = work.root / "game.registry.json", work.root / "audit.json"
for suffix, expected_missing in (
(".sprx", False), (".SPRX", True), (".suprx", False), (".SUPRX", True),
(".debug_prx", False), (".DEBUG_PRX", True), (".prx", False), (".PRX", False)):
with self.subTest(suffix=suffix):
name = "libscea" + suffix
(work.modules / "guest.so").write_bytes(build_elf([], [name]))
write_registry(registry, [("AAAAAAAAAAA", name)])
registry.with_name("game.needed.json").write_text(json.dumps([name]))
code, _, err = work.run(registry, "--strict-providers", "--json", str(result))
self.assertEqual((code, err), (1 if expected_missing else 0, ""))
data = json.loads(result.read_text())
self.assertEqual(data["missing_libraries"], {name: 2} if expected_missing else {})
self.assertEqual(data["library_mismatch"], int(expected_missing))
self.assertEqual(data["imports"][0]["providers"], ["LibSceA.prx"])

def test_elf_guest_dependencies_keep_literal_host_names(self):
work = self.work
(work.libs / "libSceA.prx").write_bytes(exporting("AAAAAAAAAAA"))
Expand Down
Loading