Skip to content

host/save_sync: t_save_sync names the cloud's device by this Mac's model, so it passes on GitHub's runners - #2608

Open
DeathKhan wants to merge 1 commit into
seedds:mainfrom
DeathKhan:claude/nx-savesync-runner-model
Open

DeathKhan wants to merge 1 commit into
seedds:mainfrom
DeathKhan:claude/nx-savesync-runner-model

Conversation

@DeathKhan

Copy link
Copy Markdown

What and why

t_save_sync fails on every CI run, main's included (e.g. run 43326823244, jobs "Host unit tests and CPU-only gfx tests" and "Sanitizers"), at step 15:

✗ both changed: the report says conflict, with the cloud's device (... csize=16 cdevice=VirtualMac2,1 sametitle=1 conflict=1 pull=0)

The check (dm/host/tests/t_save_sync.c) looks for cdevice=Mac. The cloud's save there is packed by the Mac's own session, and save_sync.c (device_name) names the device with sysctl hw.model, which on GitHub's macOS runners is VirtualMac2,1. The report is right; the test assumed a model name. The test now reads hw.model as save_sync.c does and looks for cdevice=<model>. No product code changes. No other test assumes a model name.

This unblocks the host and sanitizer jobs for open PRs, #2246 among them.

Checked

  • Tests: make -C dm/host/tests GAME=010015100B514000 save-sync on an Apple-silicon Mac (Mac18,5): t_save_sync 112 checks, 0 failed; t_save_sync_metadata 209, 0 failed. The runner's model is checked by this PR's CI.

🤖 Generated with Claude Code

…del, so it passes on GitHub's runners

Step 15's conflict check looked for "cdevice=Mac" in the report. The cloud's save there is
packed by the Mac's own session, and save_sync.c names its device with sysctl hw.model, which on
GitHub's macOS runners is "VirtualMac2,1": the check failed in the host unit tests and the
sanitizer jobs on every run, main's included (run 43326823244), while the report was right. The
test now reads hw.model as save_sync.c does and looks for " cdevice=<model> ".

Checked: make -C dm/host/tests GAME=010015100B514000 save-sync on a Mac18,5 (t_save_sync 112
checks, 0 failed; t_save_sync_metadata 209, 0 failed). No other test assumes a model name.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

host The Horizon host: SVCs, services, threads, memory (dm/host)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant