Merge pull request #678 from Alexbeav/fix/ps1b526-cycle-fixture-link-20261017

tests: refresh isolated clock and optional-netplay fixtures
This commit is contained in:
Matt Stanley
2026-10-19 11:10:17 -07:00
committed by GitHub
3 changed files with 9 additions and 1 deletions
@@ -31,6 +31,7 @@ def main():
(root / "recomp_net/auth.h").write_text("RNET_AUTH_HEADER_INCLUDED\n")
(root / "recomp_net/chat_filter.h").write_text("RNET_CHAT_HEADER_INCLUDED\n")
(root / "recomp_net/host_relay.h").write_text("RNET_HOST_RELAY_HEADER_INCLUDED\n")
(root / "recomp_net/host_ice.h").write_text("RNET_HOST_ICE_HEADER_INCLUDED\n")
flags = ["RECOMP_LAUNCHER=1", "RECOMP_LAUNCHER_HAS_ACCOUNT=1",
"SDL_VERSION_ATLEAST(x,y,z)=1", "DEFAULT_DEBUG_PORT=4370"]
if enabled:
@@ -47,7 +48,8 @@ def main():
if enabled:
for token in ("RNET_AUTH_HEADER_INCLUDED", "rnet_account_pump()",
"ae_np_account_login_begin", "account_available = ae_np_account_available",
"RNET_HOST_RELAY_HEADER_INCLUDED", "RNetHostRelayStatus st"):
"RNET_HOST_RELAY_HEADER_INCLUDED", "RNetHostRelayStatus st",
"RNET_HOST_ICE_HEADER_INCLUDED", "RNetHostIceStatus st"):
assert token in p.stdout, f"enabled path lost {token}"
else:
# netplay-off builds must not need any recomp_net header
@@ -56,6 +58,8 @@ def main():
assert "rnet_account_" not in p.stdout, "offline launcher retained account linkage"
assert "RNET_ACCOUNT_" not in p.stdout, "offline launcher retained account state dependency"
assert "RNetHostRelayStatus st" not in p.stdout, "offline launcher retained the recomp-net host relay"
assert "RNET_HOST_ICE_HEADER_INCLUDED" not in p.stdout
assert "RNetHostIceStatus st" not in p.stdout, "offline launcher retained the recomp-net host ICE"
# Compile the REAL offline lobby TU too: its early chat-report include
# used to leak an independent optional dependency before the #else.
lobby = args.source.parent / "psx_lobby_client.c"
+2
View File
@@ -6,6 +6,8 @@ int g_ls_replay_active = 0;
int g_ls_mode = 0;
int g_precise_mode = 0;
int g_psx_call_bail = 0;
int g_boot_state_cpu_timing_restored = 0; /* no restored boot state in this fixture */
int psx_mod_host_output_scope(void) { return 0; } /* no host-output mod callback */
uint32_t i_mask = 0;
uint64_t g_guest_store_count = 0;
uint64_t g_mmio_access_count = 0;
+2
View File
@@ -10,6 +10,8 @@ int g_ls_replay_active = 0;
int g_ls_mode = 0;
int g_precise_mode = 0;
int g_psx_call_bail = 0;
int g_boot_state_cpu_timing_restored = 0; /* no restored boot state in this fixture */
int psx_mod_host_output_scope(void) { return 0; } /* no host-output mod callback */
uint32_t i_mask = 0;
uint64_t g_guest_store_count = 0;
uint64_t g_mmio_access_count = 0;