fix: read xroar coco3 ROMs from RetroBat coco

RetroBat passes XRoar -rompath bios/coco for the coco system, and its
es_features offers the CoCo 3 machines there. The per-system record now
carries those machines (machines:), and an entry whose name the
platform list does not declare is launched for the system offering
its own profile system as a machine, by _norm_system_id. coco3.rom and
coco3p.rom move from bios/dragon to bios/coco. RetroBat offers no
MC-10 machine, so the mc10 ROMs keep the default bios/dragon.
This commit is contained in:
Abdessamad Derraz committed 2026-11-09 20:15:47 +01:00
1 parent 339297c75c
commit 4b17bf0460
8 files changed
+138 -8

No files matched your search

+25 -2
View File
@@ -1150,7 +1150,9 @@ class FolderArguments(unittest.TestCase):
def test_xroar_reassigned_folder_and_config_line(self):
# romPath is bios/dragon, rewritten to bios/coco for the coco system.
default, coco, config = rl.xroar(_sources(**{f"{G}/Xroar.Generator.cs": XROAR}))
default, coco, config = rl.xroar(_sources(**{
f"{G}/Xroar.Generator.cs": XROAR, rl.FEATURES: XROAR_FEATURES,
}))
self.assertEqual(
(default["search_dir"], default["passes_to"], default.get("systems")),
("bios/dragon", "command line -rompath bios/dragon", None),
@@ -1159,13 +1161,34 @@ class FolderArguments(unittest.TestCase):
(coco["search_dir"], coco["passes_to"], coco["systems"]),
("bios/coco", "command line -rompath bios/coco", ["coco"]),
)
self.assertEqual(coco["source_ref"], default["source_ref"])
self.assertEqual(coco["machines"], ["coco", "coco3"])
self.assertNotIn("machines", default)
self.assertEqual(
coco["source_ref"], f"{default['source_ref']}, {rl.FEATURES}:3-6"
)
self.assertEqual(config["search_dir"], "bios/dragon")
self.assertEqual(
config["passes_to"], 'xroar.conf rompath ".\\\\..\\\\..\\\\bios\\\\dragon"'
)
XROAR_FEATURES = """
<emulator name="xroar">
<system name="coco">
<feature submenu="EMULATION" name="MACHINE" value="xroar_machine" order="100">
<choice name="TANDY COCO(PAL)" value="coco"/>
<choice name="TANDY COCO 3(NTSC)" value="coco3"/>
</feature>
</system>
<system name="dragon32,dragon64,dragon">
<feature submenu="EMULATION" name="MACHINE" value="xroar_machine" order="100">
<choice name="DRAGON64" value="dragon64"/>
</feature>
</system>
</emulator>
"""
PICO8 = """
public override System.Diagnostics.ProcessStartInfo Generate(string system, string emulator, string core, string rom, string playersControllers, ScreenResolution resolution)
{
+26 -2
View File
@@ -308,6 +308,29 @@ class SystemFamily(unittest.TestCase):
)
class OfferedMachine(unittest.TestCase):
def test_an_entry_system_offered_as_a_machine_selects_that_launch(self) -> None:
profile = {
"emulator": "Emu", "type": "standalone", "standalone_pools": {"-rompath": ""},
"files": [
{"name": "coco3.rom", "path": "coco3.rom", "system": "coco3"},
{"name": "mc10.rom", "path": "mc10.rom", "system": "mc10"},
],
}
cfg = {
**config(
passes("emu", "bios/dragon", "-rompath"),
{**passes("emu", "bios/coco", "-rompath"), "systems": ["coco"],
"machines": ["coco", "coco3"]},
),
"systems": {"coco": {"files": [{"name": "x.zip", "native_system": "coco"}]}},
}
((view, _standalone),) = platform_layouts("emu", profile, standalone_set(cfg))
self.assertEqual(
[f.get("standalone_path") for f in view["files"]], ["coco/coco3.rom", "dragon/mc10.rom"]
)
class Layout(unittest.TestCase):
LINKED = link("emu", "$biosdir/dc", "$home/.local/share/emu is a symlink to it")
@@ -574,8 +597,9 @@ class XroarOnEachPlatform(unittest.TestCase):
"batocera": dict.fromkeys(("dragon32", "dragon64", "coco", "coco3", "mc10"), "xroar"),
"retrodeck": dict.fromkeys(("dragon32", "dragon64", "coco", "coco3", "mc10"), ""),
"retropie": dict.fromkeys(("dragon32", "dragon64", "coco", "coco3", "mc10"), ""),
"retrobat": {**dict.fromkeys(("dragon32", "dragon64", "coco3", "mc10"), "dragon"),
"coco": "coco"},
# RetroBat offers XRoar's CoCo 3 machines under coco and no MC-10.
"retrobat": {**dict.fromkeys(("dragon32", "dragon64", "mc10"), "dragon"),
**dict.fromkeys(("coco", "coco3"), "coco")},
"recalbox": {**dict.fromkeys(("dragon32", "dragon64"), "dragon"),
**dict.fromkeys(("coco", "coco3", "mc10"), "trs80coco")},
}