mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-18 07:37:49 -06:00
fix: list only what a knulli board builds
KNULLI's es_systems.yml is Batocera's model: it lists every emulator its configgen knows, and its Config.in selects many of them only on x86_64 boards, which KNULLI has none of. The platform list now holds what at least one board selects, read by the targets scraper, plus a program the launcher runs from the BIOS folder (lexaloffle). 59 cores and 44 standalone emulators leave the list, with their launcher records. The targets scraper follows Config.in and every file it sources, so a select a package declares itself counts (Batocera's mesa3d-rpi4 gives the Pi 4 OpenGL). A sourced file absent at the pin is named and read as empty: KNULLI 20260511 sources package/utils/vtree/Config.in, added in June.
This commit is contained in:
1 parent
297ec74bd9
commit
f362a54b12
9 files changed
+284
-435
No files matched your search
@@ -284,7 +284,10 @@ class TheExportKeepsTheirShape(unittest.TestCase):
|
||||
|
||||
class TheCommittedListsAgree(unittest.TestCase):
|
||||
"""A system's cores are a part of the platform's: a name only the system
|
||||
carries would escape every reader of the platform list."""
|
||||
carries would escape every reader of the platform list. A system keeps
|
||||
the list its ES file writes, which says whose files its entries ask for,
|
||||
so the one name it may carry beyond the platform's is one no device
|
||||
image builds (EmuELEC's VVVVVV port engine, KNULLI's duckstation)."""
|
||||
|
||||
def test_system_cores_are_platform_cores(self):
|
||||
import yaml
|
||||
@@ -292,10 +295,13 @@ class TheCommittedListsAgree(unittest.TestCase):
|
||||
for name in ("amberelec", "emuelec", "knulli"):
|
||||
with self.subTest(platform=name):
|
||||
config = yaml.safe_load((REPO_ROOT / "platforms" / f"{name}.yml").read_text())
|
||||
targets = yaml.safe_load(
|
||||
(REPO_ROOT / "platforms" / "targets" / f"{name}.yml").read_text())["targets"]
|
||||
built = {c for entry in targets.values() for c in entry["cores"]}
|
||||
platform = {str(c) for c in config["cores"]}
|
||||
listed = {str(c) for s in config["systems"].values() for c in s.get("cores", [])}
|
||||
self.assertTrue(listed, "no system carries its cores")
|
||||
self.assertEqual(listed - platform, set())
|
||||
self.assertEqual(listed - platform - (listed - built), set())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -231,15 +231,20 @@ class APortableUserFolder(unittest.TestCase):
|
||||
|
||||
|
||||
|
||||
class ADefaultTheBuildLacksIsNotRun(unittest.TestCase):
|
||||
"""KNULLI's configgen-defaults.yml picks suyu for the Switch, which its
|
||||
es_systems.yml does not offer and no package builds."""
|
||||
class OnlyWhatABoardBuildsIsRun(unittest.TestCase):
|
||||
"""KNULLI's es_systems.yml lists citron and shadps4, which its Config.in
|
||||
selects only on x86_64 boards (it has none), and its
|
||||
configgen-defaults.yml picks suyu, which no package builds."""
|
||||
|
||||
ES = textwrap.dedent("""\
|
||||
switch:
|
||||
emulators:
|
||||
citron:
|
||||
citron: { requireAnyOf: [BR2_PACKAGE_CITRON] }
|
||||
gba:
|
||||
emulators:
|
||||
libretro:
|
||||
mgba: { requireAnyOf: [BR2_PACKAGE_LIBRETRO_MGBA] }
|
||||
voxatron:
|
||||
emulators: {}
|
||||
""")
|
||||
@@ -253,31 +258,66 @@ class ADefaultTheBuildLacksIsNotRun(unittest.TestCase):
|
||||
kodi:
|
||||
emulator: kodi
|
||||
core: kodi
|
||||
mpv:
|
||||
emulator: mpv
|
||||
core: mpv
|
||||
""")
|
||||
LAUNCHERS = [{"emulator": "lexaloffle", "kind": "fixed_name", "passes_to": "exec",
|
||||
"search_dir": "/userdata/bios"}]
|
||||
|
||||
def test_only_what_a_package_or_the_user_supplies_is_run(self):
|
||||
def selection(self, symbols: set[str]):
|
||||
from scraper.targets.batocera_targets_scraper import BuildSelection
|
||||
|
||||
return BuildSelection(
|
||||
targets={}, emulators=frozenset({"mgba"}),
|
||||
listed=frozenset({"citron", "mgba"}), symbols=frozenset(symbols),
|
||||
packages={"kodi": "BR2_PACKAGE_KODI"},
|
||||
)
|
||||
|
||||
def test_only_what_a_board_builds_or_the_user_supplies_is_run(self):
|
||||
from scraper import batocera_scraper as bs
|
||||
|
||||
paths = ["package/batocera/emulators/citron/Config.in", "package/kodi/Config.in"]
|
||||
built = bs.packages_and_programs(bs.package_names(paths), self.LAUNCHERS)
|
||||
# A board selects kodi's package and buildroot's mpv; citron is
|
||||
# listed by es_systems, so the symbol of a folder of that name does
|
||||
# not count for it.
|
||||
built = bs.boards_build(
|
||||
self.selection({"BR2_PACKAGE_KODI", "BR2_PACKAGE_MPV", "BR2_PACKAGE_CITRON_X"}),
|
||||
self.LAUNCHERS,
|
||||
)
|
||||
cores, standalone, _dual = bs.configgen_cores(self.DEFAULTS, self.ES, set(), built)
|
||||
self.assertEqual(sorted(cores), ["citron", "kodi", "vox_official"])
|
||||
self.assertIn("lexaloffle", standalone)
|
||||
self.assertNotIn("suyu", standalone)
|
||||
self.assertEqual(sorted(cores), ["kodi", "mgba", "mpv", "vox_official"])
|
||||
self.assertEqual(sorted(standalone), ["kodi", "lexaloffle", "mpv", "vox_official"])
|
||||
# Each system keeps the list es_systems.yml writes (whose files its
|
||||
# entries ask for), less a default no package builds.
|
||||
by_system = bs.es_systems_by_system(self.ES, self.DEFAULTS, set(), built)
|
||||
self.assertEqual(by_system["switch"], ["citron"])
|
||||
# Without the packages, every default counts, as before.
|
||||
self.assertEqual(by_system["voxatron"], ["lexaloffle", "vox_official"])
|
||||
self.assertEqual(by_system["gba"], ["mgba"])
|
||||
|
||||
def test_a_listed_name_is_built_only_through_its_packages(self):
|
||||
from scraper import batocera_scraper as bs
|
||||
|
||||
built = bs.boards_build(self.selection({"BR2_PACKAGE_CITRON"}), [])
|
||||
self.assertFalse(built("citron"))
|
||||
self.assertTrue(built("mgba"))
|
||||
self.assertFalse(built("lexaloffle"))
|
||||
# Without a selection, every name counts, as before.
|
||||
self.assertIn("suyu", bs.configgen_cores(self.DEFAULTS, self.ES, set())[0])
|
||||
|
||||
def test_the_real_knulli_list_names_no_suyu(self):
|
||||
def test_the_real_lists_name_only_what_a_board_builds(self):
|
||||
import yaml
|
||||
|
||||
config = yaml.safe_load((REPO_ROOT / "platforms" / "knulli.yml").read_text())
|
||||
self.assertNotIn("suyu", config["cores"])
|
||||
self.assertNotIn("suyu", config.get("standalone_cores") or [])
|
||||
|
||||
for platform, absent in (("knulli", ("suyu", "citron", "shadps4", "pcsx2")),):
|
||||
config = yaml.safe_load((REPO_ROOT / "platforms" / f"{platform}.yml").read_text())
|
||||
names = set(config["cores"]) | set(config.get("standalone_cores") or [])
|
||||
targets = yaml.safe_load(
|
||||
(REPO_ROOT / "platforms" / "targets" / f"{platform}.yml").read_text())["targets"]
|
||||
boards = {c for entry in targets.values() for c in entry["cores"]}
|
||||
with self.subTest(platform=platform):
|
||||
self.assertFalse(names & set(absent))
|
||||
# What a board builds and the list once named is still there,
|
||||
# and what no board builds is a program the user supplies.
|
||||
self.assertLessEqual(names - boards, {"kodi", "lexaloffle", "mpv", "vox_official"})
|
||||
|
||||
|
||||
class AUserFolderInTheConfigsFolder(unittest.TestCase):
|
||||
@@ -289,7 +329,8 @@ class AUserFolderInTheConfigsFolder(unittest.TestCase):
|
||||
from common import standalone_set
|
||||
|
||||
profile = load_emulator_profiles(str(REPO_ROOT / "emulators"))["shadps4"]
|
||||
for platform in ("batocera", "knulli"):
|
||||
# KNULLI's generator does the same, but no KNULLI board builds shadps4.
|
||||
for platform in ("batocera",):
|
||||
config = load_platform_config(platform, str(REPO_ROOT / "platforms"))
|
||||
((view, _standalone),) = platform_layouts("shadps4", profile, standalone_set(config))
|
||||
with self.subTest(platform=platform):
|
||||
|
||||
@@ -548,12 +548,12 @@ class OpenmsxOnEachPlatform(unittest.TestCase):
|
||||
"""openMSX finds system ROMs by SHA1 in share/systemroms below its user
|
||||
directory and in every filepool entry. RetroBat sets OPENMSX_HOME to
|
||||
bios/openmsx, RetroPie links share/systemroms of its user directory to
|
||||
BIOS/openmsx, Batocera and KNULLI add bios/Machines and bios/openmsx to
|
||||
the filepool and list their own files in bios/openmsx."""
|
||||
BIOS/openmsx, Batocera adds bios/Machines and bios/openmsx to the
|
||||
filepool and lists its own files in bios/openmsx. KNULLI's generator
|
||||
does the same, but no KNULLI board builds openmsx."""
|
||||
|
||||
EXPECTED = {
|
||||
"batocera": {"share/systemroms": ("", "openmsx")},
|
||||
"knulli": {"share/systemroms": ("", "openmsx")},
|
||||
"retrobat": {"": ("", "openmsx")},
|
||||
"retropie": {"share/systemroms": ("", "openmsx")},
|
||||
}
|
||||
|
||||
@@ -97,6 +97,9 @@ class FailedRequestsStopTheScrape(unittest.TestCase):
|
||||
_refuse()
|
||||
return _Body(b"BR2_PACKAGE_BATOCERA_TARGET_X86_64=y\n"
|
||||
b"BR2_PACKAGE_BATOCERA_SYSTEM=y\n")
|
||||
if url.startswith("https://raw.githubusercontent.com/") and url.count("/") == 6:
|
||||
return _Body(b'source "$BR2_EXTERNAL_BATOCERA_PATH/'
|
||||
b'package/batocera/core/batocera-system/Config.in"\n')
|
||||
if url.endswith("Config.in"):
|
||||
return _Body(b"config BR2_PACKAGE_BATOCERA_SYSTEM\n"
|
||||
b"\tselect BR2_PACKAGE_MGBA\n\n"
|
||||
@@ -262,6 +265,15 @@ class KnulliPerBoard(unittest.TestCase):
|
||||
"BR2_arm=y\nBR2_PACKAGE_BATOCERA_TARGET_H700=y\n"
|
||||
),
|
||||
"configs/knulli-h700_armhf_libs.packages": "BR2_PACKAGE_SDL2=y\n",
|
||||
# The root Config.in sources KNULLI's system and Batocera's packages
|
||||
# from the batocera submodule, where a package selects another.
|
||||
"Config.in": (
|
||||
'source "$BR2_EXTERNAL_KNULLI_PATH/package/system/knulli-system/Config.in"\n'
|
||||
'source "$BR2_EXTERNAL_KNULLI_PATH/batocera/package/batocera/emulators/'
|
||||
'ppsspp/Config.in"\n'
|
||||
'#source "$BR2_EXTERNAL_KNULLI_PATH/package/utils/off/Config.in"\n'
|
||||
'source "$BR2_EXTERNAL_KNULLI_PATH/package/utils/vtree/Config.in"\n'
|
||||
),
|
||||
"package/system/knulli-system/Config.in": (
|
||||
"if BR2_PACKAGE_BATOCERA_TARGET_H700 || \\\n"
|
||||
" BR2_PACKAGE_BATOCERA_TARGET_A133\n"
|
||||
@@ -282,6 +294,8 @@ class KnulliPerBoard(unittest.TestCase):
|
||||
" mgba: {requireAnyOf: [BR2_PACKAGE_LIBRETRO_MGBA]}\n"
|
||||
"psp:\n emulators:\n ppsspp:\n"
|
||||
" ppsspp: {requireAnyOf: [BR2_PACKAGE_PPSSPP]}\n"
|
||||
"pspassets:\n emulators:\n libretro:\n"
|
||||
" assets: {requireAnyOf: [BR2_PACKAGE_PPSSPP_ASSETS]}\n"
|
||||
),
|
||||
}
|
||||
|
||||
@@ -314,6 +328,13 @@ class KnulliPerBoard(unittest.TestCase):
|
||||
return _Body(json.dumps([{"name": n} for n in names]))
|
||||
if url == f"{api}buildroot?ref={pin}":
|
||||
return _Body('{"sha": "c2d7985b"}')
|
||||
if url == f"{api}batocera?ref={pin}":
|
||||
return _Body('{"sha": "487014d9"}')
|
||||
if url == ("https://raw.githubusercontent.com/batocera-linux/batocera.linux/"
|
||||
"487014d9/package/batocera/emulators/ppsspp/Config.in"):
|
||||
return _Body("config BR2_PACKAGE_PPSSPP\n\tselect BR2_PACKAGE_PPSSPP_ASSETS\n")
|
||||
if url == f"{raw}package/utils/vtree/Config.in":
|
||||
raise urllib.error.HTTPError(url, 404, "Not Found", {}, None)
|
||||
if url.startswith("https://raw.githubusercontent.com/knulli-cfw/buildroot/c2d7985b/"):
|
||||
return _Body("config BR2_aarch64\n\tselect BR2_ARCH_IS_64\n")
|
||||
path = url.removeprefix(raw)
|
||||
@@ -330,11 +351,12 @@ class KnulliPerBoard(unittest.TestCase):
|
||||
self.assertEqual(sorted(data["targets"]), ["h700", "r16"])
|
||||
# The images name what a card's boot/knulli.board holds.
|
||||
self.assertEqual(data["targets"]["h700"],
|
||||
{"architecture": "aarch64", "cores": ["mgba", "ppsspp"],
|
||||
{"architecture": "aarch64", "cores": ["assets", "mgba", "ppsspp"],
|
||||
"images": ["rg35xx-plus", "rg35xx-sp"]})
|
||||
self.assertEqual(data["targets"]["r16"],
|
||||
{"architecture": "arm", "cores": ["mgba"], "images": ["miyoo-a30"]})
|
||||
self.assertTrue(all(pin in url or "buildroot/c2d7985b" in url for url in seen), seen)
|
||||
self.assertTrue(all(pin in url or "buildroot/c2d7985b" in url
|
||||
or "batocera.linux/487014d9" in url for url in seen), seen)
|
||||
|
||||
|
||||
class RocknixPerDevice(unittest.TestCase):
|
||||
|
||||
Reference in new issue
Block a user