mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-15 22:43:48 -06:00
fix: keep buildbot cores a standalone name hides
Batocera's x86_64 RetroArch downloads the amiberry, cemu and xemu cores although the image builds standalone emulators of those names. They now stay in installable_cores, run both ways, and reach only the boards whose downloader offers them.
This commit is contained in:
1 parent
577b654a9d
commit
8a4b7aa8e6
7 files changed
+104
-13
No files matched your search
@@ -687,7 +687,7 @@ class AmiberryBuildEachPlatformShips(unittest.TestCase):
|
||||
"rocknix": {"amiberry-5.6.5"},
|
||||
"amberelec": {"amiberry-7.1.1"},
|
||||
"emuelec": {"amiberry-8.0.0"},
|
||||
"batocera": {"amiberry-7.1.1-332"},
|
||||
"batocera": {"amiberry", "amiberry-7.1.1-332"},
|
||||
"knulli": {"amiberry-7.1.1"},
|
||||
"recalbox": {"amiberry-8.2.2"},
|
||||
"retrobat": {"amiberry", "amiberry-8.3.0"},
|
||||
@@ -711,6 +711,22 @@ class AmiberryBuildEachPlatformShips(unittest.TestCase):
|
||||
with self.subTest(platform=platform):
|
||||
self.assertEqual(self.resolved(platform), own)
|
||||
|
||||
def test_the_buildbot_core_runs_where_retroarch_installs_it(self) -> None:
|
||||
from common import load_target_config, resolve_platform_cores
|
||||
|
||||
for platform in ("retroarch", "lakka", "batocera"):
|
||||
with self.subTest(platform=platform):
|
||||
self.assertIn("amiberry", self.resolved(platform))
|
||||
cfg = load_platform_config("batocera", str(REPO_ROOT / "platforms"))
|
||||
# x86_64 boards download from linux-x86_64, which builds the core.
|
||||
# linux-armhf does not, and aarch64 boards have no downloader.
|
||||
for target, runs in (("x86_64", True), ("zen3", True), ("h3", False), ("bcm2711", False)):
|
||||
cores = load_target_config("batocera", target, str(REPO_ROOT / "platforms"))
|
||||
with self.subTest(target=target):
|
||||
resolved = resolve_platform_cores(cfg, self.profiles, cores)
|
||||
self.assertEqual("amiberry" in resolved, runs)
|
||||
self.assertIn("amiberry-7.1.1-332", resolved)
|
||||
|
||||
def test_retropie_reads_kickstarts_below_its_start_folder(self) -> None:
|
||||
# amiberry 5.7 and 6.3 read <start path>/kickstarts, which RetroPie
|
||||
# links to bios/amiga. Its whdboot and roms folders stay below it.
|
||||
|
||||
@@ -298,8 +298,13 @@ class CoreDownloaderReach(unittest.TestCase):
|
||||
fetched |= load_target_config("retroarch", entry["downloads"], root) or set()
|
||||
if entry["architecture"] == "aarch64":
|
||||
self.assertNotIn("downloads", entry)
|
||||
# A name the image gives a standalone emulator only is not the
|
||||
# buildbot core of that name, which stays installable.
|
||||
standalone_only = set(config.get("standalone_cores") or []) - set(
|
||||
config.get("dual_mode_cores") or [])
|
||||
with self.subTest(platform=platform):
|
||||
self.assertEqual(set(config["installable_cores"]), fetched - set(config["cores"]))
|
||||
self.assertEqual(set(config["installable_cores"]),
|
||||
fetched - (set(config["cores"]) - standalone_only))
|
||||
|
||||
|
||||
class KnulliPerBoard(unittest.TestCase):
|
||||
|
||||
Reference in new issue
Block a user