mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-15 14:33:47 -06:00
chore: merge integ installable fix
This commit is contained in:
commit
c77aa7eed6
5 files changed
+84
-58
No files matched your search
+12
-10
@@ -3304,30 +3304,32 @@ class TestBumpCommit(unittest.TestCase):
|
||||
self.assertNotIn("uphead", text)
|
||||
|
||||
def test_a_profile_one_platform_ships_waits_for_its_build(self):
|
||||
"""EmuELEC alone ships RigelEngine and builds its package.mk
|
||||
PKG_VERSION. A bulk advance moved fheroes2 and supertux past that
|
||||
build, and rigelengine is a commit ahead of it already."""
|
||||
"""KNULLI alone ships advanced_drastic and builds its
|
||||
advanced_drastic.mk version. A bulk advance moved fheroes2 and
|
||||
supertux past the build EmuELEC then pinned, and a pin ahead of the
|
||||
one build a platform ships describes nothing anyone runs."""
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
path = Path(self.tmp.name) / "rigelengine.yml"
|
||||
path = Path(self.tmp.name) / "advanced_drastic.yml"
|
||||
path.write_text(
|
||||
SAMPLE.replace("\nnotes:", "\ntype: standalone\ncores: [rigelengine, RigelEngine]\n\nnotes:", 1),
|
||||
SAMPLE.replace(
|
||||
"\nnotes:", "\ntype: standalone\ncores: [advanced_drastic]\n\nnotes:", 1),
|
||||
encoding="utf-8",
|
||||
)
|
||||
report = ProfileReport(
|
||||
name="rigelengine", repo="o/n", pin="pin", head="newhead", entries=[],
|
||||
name="advanced_drastic", repo="o/n", pin="pin", head="newhead", entries=[],
|
||||
counts={}, skipped=profile_sync.NO_SOURCE_REF,
|
||||
)
|
||||
platforms = str(root / "platforms")
|
||||
self.assertEqual(
|
||||
profile_sync.shipping_platforms("rigelengine", self.tmp.name, platforms),
|
||||
["emuelec"],
|
||||
profile_sync.shipping_platforms("advanced_drastic", self.tmp.name, platforms),
|
||||
["knulli"],
|
||||
)
|
||||
with contextlib.redirect_stderr(io.StringIO()) as err:
|
||||
self.assertFalse(bump_commit(path, report, platforms_dir=platforms))
|
||||
self.assertIn("only emuelec ships it", err.getvalue())
|
||||
self.assertIn("only knulli ships it", err.getvalue())
|
||||
path.write_text(
|
||||
path.read_text(encoding="utf-8")
|
||||
+ 'pin_follows: "EmuELEC builds the branch tip"\n',
|
||||
+ 'pin_follows: "KNULLI builds the branch tip"\n',
|
||||
encoding="utf-8",
|
||||
)
|
||||
self.assertTrue(bump_commit(path, report, platforms_dir=platforms))
|
||||
|
||||
@@ -657,7 +657,6 @@ class AmiberryOnEachPlatform(unittest.TestCase):
|
||||
self.assertNotIn("unplaced", entry)
|
||||
self.assertEqual(entry["standalone_path"], f"{folder}/{layout}")
|
||||
|
||||
|
||||
def test_retrobat_reads_its_folders_below_the_amiberry_emulator_folder(self) -> None:
|
||||
# RetroBat writes rom_path and whdboot_path below the amiberry
|
||||
# folder of its install and copies the kickstarts it finds in bios
|
||||
@@ -681,7 +680,9 @@ class AmiberryOnEachPlatform(unittest.TestCase):
|
||||
|
||||
class AmiberryBuildEachPlatformShips(unittest.TestCase):
|
||||
"""Each platform resolves the name amiberry to the build its own package
|
||||
compiles. RetroBat keeps the 8.5.0 libretro core beside its standalone."""
|
||||
compiles. RetroBat keeps the 8.5.0 libretro core beside its standalone,
|
||||
and Batocera's x86_64 boards fetch it with RetroArch's core downloader
|
||||
(installable_cores)."""
|
||||
|
||||
OWN = {
|
||||
"rocknix": {"amiberry-5.6.5"},
|
||||
|
||||
@@ -298,13 +298,41 @@ 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"]) - standalone_only))
|
||||
built = ((set(config["cores"]) - set(config.get("standalone_cores") or []))
|
||||
| set(config.get("dual_mode_cores") or []))
|
||||
self.assertEqual(set(config["installable_cores"]), fetched - built)
|
||||
|
||||
def test_a_standalone_name_keeps_its_buildbot_core(self):
|
||||
"""Batocera runs amiberry standalone, and its x86_64 boards fetch
|
||||
amiberry_libretro: removing every name the image builds lost the
|
||||
libretro core to the name it shares with the standalone package."""
|
||||
from common import DUAL_MODE_PREFIX, resolve_platform_cores, standalone_set # noqa: PLC0415
|
||||
from scraper.batocera_scraper import installable_cores # noqa: PLC0415
|
||||
from scraper.targets.batocera_targets_scraper import BuildSelection # noqa: PLC0415
|
||||
|
||||
selection = BuildSelection(
|
||||
targets={"x86_64": {"architecture": "x86_64", "cores": [],
|
||||
"downloads": "linux-x86_64"}},
|
||||
emulators=frozenset(), listed=frozenset(), symbols=frozenset(), packages={},
|
||||
)
|
||||
found = installable_cores(selection, ["amiberry", "mgba", "dolphin"],
|
||||
["amiberry", "dolphin"], ["dolphin"])
|
||||
self.assertIn("amiberry", found)
|
||||
self.assertNotIn("mgba", found)
|
||||
self.assertNotIn("dolphin", found)
|
||||
|
||||
profiles = {
|
||||
"amiberry": {"type": "libretro", "cores": ["amiberry"], "systems": ["amiga"]},
|
||||
"amiberry-7": {"type": "standalone", "cores": ["amiberry"], "systems": ["amiga"],
|
||||
"built_by": ["demo"], "source": "https://x/amiberry"},
|
||||
}
|
||||
config = {"_key": "demo", "cores": ["amiberry"], "standalone_cores": ["amiberry"],
|
||||
"installable_cores": ["amiberry"]}
|
||||
self.assertEqual(resolve_platform_cores(config, profiles), {"amiberry", "amiberry-7"})
|
||||
self.assertEqual(resolve_platform_cores({**config, "installable_cores": []}, profiles),
|
||||
{"amiberry-7"})
|
||||
self.assertIn(DUAL_MODE_PREFIX + "amiberry", standalone_set(config))
|
||||
|
||||
|
||||
class KnulliPerBoard(unittest.TestCase):
|
||||
|
||||
Reference in new issue
Block a user