From 2f6db82da7f4fb25e2cc7bbb872665ce7b1c812d Mon Sep 17 00:00:00 2001 From: MrMha <114929652+MrMha@users.noreply.github.com> Date: Sun, 11 Oct 2026 19:30:28 +0400 Subject: [PATCH] fix(nid-names): normalize Windows inventory paths --- tools/nid_names.py | 2 +- tools/tests/test_nid_names.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/nid_names.py b/tools/nid_names.py index edb87dc69..8dd9382e7 100644 --- a/tools/nid_names.py +++ b/tools/nid_names.py @@ -97,7 +97,7 @@ def collect_unknowns(): for path in source_files(PRX): text = path.read_text(encoding="utf-8") for nid, name in source_aliases(text): - found.setdefault(nid, "%s:%s" % (path.relative_to(ROOT), name)) + found.setdefault(nid, "%s:%s" % (path.relative_to(ROOT).as_posix(), name)) return found diff --git a/tools/tests/test_nid_names.py b/tools/tests/test_nid_names.py index 39711f949..0ac509da5 100644 --- a/tools/tests/test_nid_names.py +++ b/tools/tests/test_nid_names.py @@ -4,7 +4,7 @@ import json import tempfile import sys import unittest -from pathlib import Path +from pathlib import Path, PureWindowsPath from unittest.mock import patch from urllib.error import URLError @@ -161,6 +161,12 @@ int APS5_VABI sceReal() { return 0; } self.write_source('APS5_EXPORT (\n "AAAAAAAAAAA" ,\n exampleUnknown00\n );\n') self.assertEqual(nid_names.collect_unknowns(), {"AAAAAAAAAAA": "core/libs/prx/libSceExample/Export.cpp:exampleUnknown00"}) + def test_windows_source_paths_use_portable_separators(self): + self.write_source('APS5_EXPORT("AAAAAAAAAAA", exampleUnknown00);\n') + relative = PureWindowsPath("core/libs/prx/libSceExample/Export.cpp") + with patch.object(Path, "relative_to", return_value=relative): + self.assertEqual(nid_names.collect_unknowns(), {"AAAAAAAAAAA": "core/libs/prx/libSceExample/Export.cpp:exampleUnknown00"}) + def test_test_fixtures_are_not_runtime_implementations(self): self.write_source('APS5_EXPORT("AAAAAAAAAAA", exampleUnknown00);\nint APS5_VABI sceFixture() { return 0; }\n', "tests/Fixture.cpp") self.assertEqual(nid_names.collect_unknowns(), {})