test(build): give the CPM discovery check's toolchain stand-in find and need #561

Merged

HumanBean merged 1 commit from zeldaootr/Longshot:cpm-discovery-test-toolchain-find into main 2026-11-15 17:58:51 +00:00

Conversation 2 Commits 1 Files changed 1 +11 -1

zeldaootr commented 2026-11-14 19:21:25 +00:00

Contributor

• Copy link
• Copy Markdown

Type: test · Risk: low · Tested on: Linux, no GPU (game-free check); Windows 11 (a reviewer's run of the check) · Needs: none

Why

tests/test_cpm_discovery.py has failed on main since #524 merged, and still fails on main aa95d35f: nx2/build.py now asks toolchain.find("clang") when it is imported, and the check's stand-in for toolchain has no find, so all six tests that import the build stop with an AttributeError before checking anything.

How to reproduce

Seen on: Linux (Ubuntu 24.04), no GPU; Windows 11 (the reviewer's run)
Settings and switches: none
Steps: on main aa95d35f, run python -I -B tests/test_cpm_discovery.py
Expected: 7 tests, OK (one skipped where there are no system Vulkan or SPIR-V headers)
Actual: FAILED (errors=6, skipped=1): AttributeError: 'types.SimpleNamespace' object has no attribute 'find' at _CLANG = toolchain.find("clang") in nx2/build.py

What changed

Test-only: the check's stand-in for toolchain gets the find and need that nx2/build.py now calls at import, so the check runs again and checks the same package discovery as before. No product file changes.

• tests: tests/test_cpm_discovery.py, the toolchain stand-in in build() gains find and need, behaving as the real ones in third_party/a64-kit/tools/toolchain.py do on a PC without clang: find returns a path that is not a file, and need stops on a missing file. With no clang file, #524's -march=native query is skipped at import, so the check still runs no compiler and no process (the subprocess guards are unchanged).
• #524's build code is right for the real toolchain, whose find always returns a path; the check's stub predates it (the two changes crossed).

Measurements

Verdict: passes: the check fails on main (6 errors) and passes on this branch, in two interleaved rounds on Linux; a reviewer saw the same on Windows 11.

Hardware: Linux x86-64 PC (Ubuntu 24.04), no GPU used; Python 3.15
Scene: no game: the game-free check
Method: python3 -I -B tests/test_cpm_discovery.py on main and on this branch, twice each, alternating (nx2/build.py is the same in both); its unittest result per run
How to reproduce: python -I -B tests/test_cpm_discovery.py on each commit

	Before: main @ aa95d35f	After: this PR @ 8bc176f7
tests/test_cpm_discovery.py, round 1	FAILED (errors=6, skipped=1)	OK (skipped=1)
tests/test_cpm_discovery.py, round 2	FAILED (errors=6, skipped=1)	OK (skipped=1)

aa95d35f r1: FAILED (errors=6, skipped=1)
8bc176f7 r1: OK (skipped=1)
aa95d35f r2: FAILED (errors=6, skipped=1)
8bc176f7 r2: OK (skipped=1)
aa95d35f: nx2/build.py: _CLANG = toolchain.find("clang")
aa95d35f: AttributeError: 'types.SimpleNamespace' object has no attribute 'find'

The skip is test_system_usr_without_cpm (no system Vulkan or SPIR-V headers on this PC), skipped on both.

Flags and settings

None

Testing

Tested: Linux, game-free: the check fails on main aa95d35f and passes on this branch (8bc176f7, rebased onto aa95d35f), twice each, alternating; it passes at the tip under tests/run_all.py with g++ 13.3 and with clang 23.1.5 as CXX (the check runs no compiler). Before the rebase (7d9e4d69 on main 7ff5256e) it did the same, and the other checks that import nx2/build.py with a stand-in toolchain or read the native-CPU code passed: test_cpu_target, test_appimage_player_build, test_linux_tools, test_kept_translation, test_missing_nup, test_mark_groups, test_msvc_oldnames, test_build_log, test_link_path_comma. Windows: futondestroyer reviewed the diff at 7d9e4d69 and ran the check natively on Windows 11 with Python 3.14.7 (python -I -B tests/test_cpm_discovery.py -v): on main 5d3ecc78 six import errors (toolchain.find missing) and one system-header skip; at 7d9e4d69 six passed, the same skip; and this PR's fixture against that newer main's build module, six passed, the same skip (#561, the approving review).

Not tested: nothing the check depends on; the game is not involved.

Must be tested: None

Risks

What could break: only this check.

Turning it off: revert the commit

Compatibility: Nothing changes

Checklist

Everyone

• One topic.
• The title is a Conventional Commit (type(scope): description) of the status line's type.
• Why gives the reason plainly and links the issues that fit (the tracker searched).
• Measurements has a verdict, or one line saying why there is nothing to measure.
• Testing names what was tested, what wasn't, and what must still be tested, where and how.
• Rebased on current main. Onto main aa95d35f, no conflict; the commit is the same change as 7d9e4d69 (git patch-id).
• python -I -B tests/run_all.py passes (any failure that also fails on main is named). The full suite on main aa95d35f (Linux, g++ 13.3, the Vulkan headers set): 528 passed, 15 failed, 50 skipped, tests/test_cpm_discovery.py among the 15; this PR changes only that check, which passes here. The other 14 fail on main alike: test_appimage_player_build, test_bake_portability, test_crash_dialog, test_env_on, test_lift_cache, test_lift_cleanup_error, test_make_game_cache, test_mods_size_table, test_options_budget_once, test_pipeline_tour, test_readback_late, test_vk_pgo, test_walk_key and nx2/test_texture_init_barrier.py.
• No game files, dumps, build output or generated files.
• third_party/ untouched (a new folder with a PROVENANCE.md instead).
• The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled.

When it applies

• AI assistance recorded with Assisted-by: / Co-Authored-By: trailers.
• Numbers from the same PC, scene and settings, at least 2 interleaved runs each, the median reported.

**Type:** test · **Risk:** low · **Tested on:** Linux, no GPU (game-free check); Windows 11 (a reviewer's run of the check) · **Needs:** none ## Why `tests/test_cpm_discovery.py` has failed on `main` since https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/524 merged, and still fails on `main` aa95d35f: `nx2/build.py` now asks `toolchain.find("clang")` when it is imported, and the check's stand-in for `toolchain` has no `find`, so all six tests that import the build stop with an `AttributeError` before checking anything. ## How to reproduce **Seen on:** Linux (Ubuntu 24.04), no GPU; Windows 11 (the reviewer's run) **Settings and switches:** none **Steps:** on `main` aa95d35f, run `python -I -B tests/test_cpm_discovery.py` **Expected:** 7 tests, OK (one skipped where there are no system Vulkan or SPIR-V headers) **Actual:** `FAILED (errors=6, skipped=1)`: `AttributeError: 'types.SimpleNamespace' object has no attribute 'find'` at `_CLANG = toolchain.find("clang")` in `nx2/build.py` ## What changed Test-only: the check's stand-in for `toolchain` gets the `find` and `need` that `nx2/build.py` now calls at import, so the check runs again and checks the same package discovery as before. No product file changes. - tests: `tests/test_cpm_discovery.py`, the `toolchain` stand-in in `build()` gains `find` and `need`, behaving as the real ones in `third_party/a64-kit/tools/toolchain.py` do on a PC without clang: `find` returns a path that is not a file, and `need` stops on a missing file. With no clang file, #524's `-march=native` query is skipped at import, so the check still runs no compiler and no process (the `subprocess` guards are unchanged). - #524's build code is right for the real `toolchain`, whose `find` always returns a path; the check's stub predates it (the two changes crossed). ## Measurements **Verdict:** passes: the check fails on `main` (6 errors) and passes on this branch, in two interleaved rounds on Linux; a reviewer saw the same on Windows 11. Hardware: Linux x86-64 PC (Ubuntu 24.04), no GPU used; Python 3.15 Scene: no game: the game-free check Method: `python3 -I -B tests/test_cpm_discovery.py` on `main` and on this branch, twice each, alternating (`nx2/build.py` is the same in both); its unittest result per run How to reproduce: `python -I -B tests/test_cpm_discovery.py` on each commit | | Before: main @ aa95d35f | After: this PR @ 8bc176f7 | |---|---|---| | `tests/test_cpm_discovery.py`, round 1 | FAILED (errors=6, skipped=1) | OK (skipped=1) | | `tests/test_cpm_discovery.py`, round 2 | FAILED (errors=6, skipped=1) | OK (skipped=1) | ``` aa95d35f r1: FAILED (errors=6, skipped=1) 8bc176f7 r1: OK (skipped=1) aa95d35f r2: FAILED (errors=6, skipped=1) 8bc176f7 r2: OK (skipped=1) aa95d35f: nx2/build.py: _CLANG = toolchain.find("clang") aa95d35f: AttributeError: 'types.SimpleNamespace' object has no attribute 'find' ``` The skip is `test_system_usr_without_cpm` (no system Vulkan or SPIR-V headers on this PC), skipped on both. ### Flags and settings None ## Testing **Tested:** Linux, game-free: the check fails on `main` aa95d35f and passes on this branch (8bc176f7, rebased onto aa95d35f), twice each, alternating; it passes at the tip under `tests/run_all.py` with g++ 13.3 and with clang 23.1.5 as `CXX` (the check runs no compiler). Before the rebase (7d9e4d69 on main 7ff5256e) it did the same, and the other checks that import `nx2/build.py` with a stand-in `toolchain` or read the native-CPU code passed: `test_cpu_target`, `test_appimage_player_build`, `test_linux_tools`, `test_kept_translation`, `test_missing_nup`, `test_mark_groups`, `test_msvc_oldnames`, `test_build_log`, `test_link_path_comma`. Windows: futondestroyer reviewed the diff at 7d9e4d69 and ran the check natively on Windows 11 with Python 3.14.7 (`python -I -B tests/test_cpm_discovery.py -v`): on main 5d3ecc78 six import errors (`toolchain.find` missing) and one system-header skip; at 7d9e4d69 six passed, the same skip; and this PR's fixture against that newer main's build module, six passed, the same skip (https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/561, the approving review). **Not tested:** nothing the check depends on; the game is not involved. **Must be tested:** None ## Risks **What could break:** only this check. **Turning it off:** revert the commit **Compatibility:** Nothing changes ## Checklist ### Everyone - [x] One topic. - [x] The title is a Conventional Commit (`type(scope): description`) of the status line's type. - [x] Why gives the reason plainly and links the issues that fit (the tracker searched). - [x] Measurements has a verdict, or one line saying why there is nothing to measure. - [x] Testing names what was tested, what wasn't, and what must still be tested, where and how. - [x] Rebased on current `main`. Onto main aa95d35f, no conflict; the commit is the same change as 7d9e4d69 (`git patch-id`). - [x] `python -I -B tests/run_all.py` passes (any failure that also fails on `main` is named). The full suite on main aa95d35f (Linux, g++ 13.3, the Vulkan headers set): 528 passed, 15 failed, 50 skipped, `tests/test_cpm_discovery.py` among the 15; this PR changes only that check, which passes here. The other 14 fail on main alike: `test_appimage_player_build`, `test_bake_portability`, `test_crash_dialog`, `test_env_on`, `test_lift_cache`, `test_lift_cleanup_error`, `test_make_game_cache`, `test_mods_size_table`, `test_options_budget_once`, `test_pipeline_tour`, `test_readback_late`, `test_vk_pgo`, `test_walk_key` and `nx2/test_texture_init_barrier.py`. - [x] No game files, dumps, build output or generated files. - [x] `third_party/` untouched (a new folder with a `PROVENANCE.md` instead). - [x] The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled. ### When it applies - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. - [x] Numbers from the same PC, scene and settings, at least 2 interleaved runs each, the median reported.

zeldaootr added 1 commit 2026-11-14 19:21:25 +00:00

give test_cpm_discovery's toolchain stand-in find and need ... 7d9e4d69fd

Assisted-by: Claude

zeldaootr referenced this pull request 2026-11-14 19:30:57 +00:00

fix(menu): longshot_options.ini is replaced whole or not at all #550

zeldaootr referenced this pull request 2026-11-14 19:30:59 +00:00

fix(vk): a mesh fallback program with bigger payloads reuses the record arena #551

zeldaootr referenced this pull request 2026-11-14 19:31:01 +00:00

fix(vk): a recording without a draw stream is submitted instead of crashing #552

zeldaootr referenced this pull request 2026-11-14 19:31:04 +00:00

fix(vk): a read-back after a timed-out one waits for the GPU, and its textures are kept #553

zeldaootr referenced this pull request 2026-11-14 19:31:06 +00:00

fix(vk): a timed-out read-back's source images are kept until the GPU is past the copy #554

zeldaootr referenced this pull request 2026-11-14 19:31:08 +00:00

fix(vk): shader preparation shows progress while it builds compute pipelines #555

zeldaootr referenced this pull request 2026-11-14 19:31:10 +00:00

fix(vk): FSR 3.1 frees its images once the chain lets it go, not at its next upscale #556

zeldaootr referenced this pull request 2026-11-14 19:31:13 +00:00

fix(linux): a saves move that fails part way brings back what it moved #557

zeldaootr referenced this pull request 2026-11-14 19:31:16 +00:00

fix: a log file that cannot be opened no longer closes stderr #558

zeldaootr referenced this pull request 2026-11-14 19:31:19 +00:00

WIP: fix(vk): Auto settings take SteamDeck=1 as a handheld only on an integrated GPU #559

zeldaootr referenced this pull request 2026-11-14 20:33:38 +00:00

fix(host): a thread lowered right after it is created runs lowered on Linux #496

futondestroyer approved these changes 2026-11-14 22:04:54 +00:00

futondestroyer left a comment

• Copy link
• Copy Markdown

Reviewed the complete one-file diff at 7d9e4d69fd and checked the stand-in against the real toolchain.find/need contract. The nonexistent compiler path correctly skips the import-time CPU query; the existing subprocess guards and package-discovery assertions remain intact. No production changes or blocking findings.

Independent native Windows 11 / Python 3.14.7 verification, using python -I -B tests/test_cpm_discovery.py -v:

• Main control at 5d3ecc7854: six import errors (toolchain.find missing), one existing system-header skip.
• Exact PR head: six passed, the same one skip.
• The PR fixture against that newer main's actual build module: six passed, the same one skip. Restored the owned control file after the comparison.

This independently covers the Windows gap in the description. I did not repeat the full suite or run the game for this fixture-only change; the author's full-suite results and limitations remain as documented.

Reviewed the complete one-file diff at 7d9e4d69fd2a0c023c3f9e812ff36e51fd0e1ae5 and checked the stand-in against the real toolchain.find/need contract. The nonexistent compiler path correctly skips the import-time CPU query; the existing subprocess guards and package-discovery assertions remain intact. No production changes or blocking findings. Independent native Windows 11 / Python 3.14.7 verification, using `python -I -B tests/test_cpm_discovery.py -v`: - Main control at 5d3ecc78540534f4efd055b4fc432a3bed9f0459: six import errors (`toolchain.find` missing), one existing system-header skip. - Exact PR head: six passed, the same one skip. - The PR fixture against that newer main's actual build module: six passed, the same one skip. Restored the owned control file after the comparison. This independently covers the Windows gap in the description. I did not repeat the full suite or run the game for this fixture-only change; the author's full-suite results and limitations remain as documented.

zeldaootr referenced this pull request 2026-11-15 00:55:49 +00:00

test(vk): the env_on and late readback checks match the render thread's source #622

zeldaootr referenced this pull request 2026-11-15 00:55:52 +00:00

test(build): the lift clean-up check stands in for the shared lift store #623

zeldaootr referenced this pull request 2026-11-15 00:55:54 +00:00

test(linux): the AppImage check looks for the renderer's folder in the image, not among the build tools #624

zeldaootr referenced this pull request 2026-11-15 00:55:57 +00:00

docs(profiles): the renderer profile's note has its Recorded line again #625

zeldaootr referenced this pull request 2026-11-15 00:56:00 +00:00

test(host): the crash window's check runs through on Linux with g++ and clang #626

zeldaootr referenced this pull request 2026-11-15 00:56:03 +00:00

test(scripts): the pipeline tour check's stale snapshot is older than calm's tolerance #627

zeldaootr referenced this pull request 2026-11-15 00:56:05 +00:00

test: three checks run or skip by what the PC has, instead of failing without it #628

d4nkn3ss referenced this pull request 2026-11-15 13:07:53 +00:00

test(build): the make_game checks let go of the work folder's lock, so Windows can delete their temporary folders #804

SocialWare referenced this pull request 2026-11-15 13:27:34 +00:00

Game: Crash in Hyrule field after opening and closing map #809

mooki added the

kind

chore

platform/linux

platform/windows

priority

low

labels 2026-11-15 13:55:56 +00:00

zeldaootr commented 2026-11-15 16:41:56 +00:00

Author

Contributor

• Copy link
• Copy Markdown

Rebased onto main aa95d35f (8bc176f7, the same change as 7d9e4d69, no conflict) and the description moved to the current template, with futondestroyer's Windows 11 run from the review in Testing (thank you). The check still fails on main aa95d35f (6 errors) and passes here, two interleaved rounds, so the numbers are measured again on the new base rather than carried over.

Rebased onto `main` aa95d35f (8bc176f7, the same change as 7d9e4d69, no conflict) and the description moved to the current template, with futondestroyer's Windows 11 run from the review in Testing (thank you). The check still fails on `main` aa95d35f (6 errors) and passes here, two interleaved rounds, so the numbers are measured again on the new base rather than carried over.

zeldaootr force-pushed cpm-discovery-test-toolchain-find from 7d9e4d69fd to 8bc176f7de 2026-11-15 16:44:00 +00:00 Compare

HumanBean merged commit 489f3a636d into main 2026-11-15 17:58:51 +00:00

HumanBean referenced this pull request from a commit 2026-11-15 17:58:52 +00:00

test(build): give the CPM discovery check's toolchain stand-in find and need (#561)

HumanBean deleted branch cpm-discovery-test-toolchain-find 2026-11-15 17:58:53 +00:00

llun referenced this pull request 2026-11-15 18:06:45 +00:00

fix(build): a romfs without the game's heap definition is refused too, also from a .nup and for an update #863

llun referenced this pull request 2026-11-15 18:12:10 +00:00

fix(build): a romfs without the game's heap definition is refused too, also from a .nup and for an update #863

HumanBean referenced this pull request from a commit 2026-11-15 18:18:44 +00:00

fix(build): a romfs without the game's heap definition is refused too, also from a .nup and for an update (#863)

Some checks are pending

Hide checks

CI / Conventional Commit title (pull_request) Blocked by required conditions

Details

CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions

Details

CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions

Details

CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions

Details

CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions

Details

Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions

Details

Third-party parts / As their notes say (pull_request) Blocked by required conditions

Details

Third-party parts / The same as upstream (pull_request) Blocked by required conditions

Details

Website / Website on Cloudflare (pull_request) Blocked by required conditions

Details

PR description / Description follows the template (pull_request_target) Successful in 4s

Details

Some workflows are waiting to be reviewed.

Sign in to join this conversation.

Reviewers

No reviewers

futondestroyer

Labels

Clear labels   

area/accessibility

Barriers for people with disabilities

  

area/audio

Sound and music

  

area/input

Controllers, keyboard, mouse

  

area/install

Installing, updating, building from your game

  

area/menu

In-game menu and settings

  

area/renderer

Vulkan renderer, shaders, effects

  

area/saves

Save files

  

area/upscaling

DLSS, FSR, frame generation

  

beanstalk: approved @ 1697603

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 2c5a62e

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 4fd82b7

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 64d6d09

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 6f91fae

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 70a78f9

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 8d361dc

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 9d8356e

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ abf2227

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ d82f202

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ e5f1e40

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ ee8ab5f

Set by Beanstalk for show; the farm's database is what counts

  

ci: approved

A maintainer approved CircleCI for this fork PR (sticky; removed after 14 quiet days)

  

good first issue

A good start for a new contributor

  

gpu/amd

AMD GPUs

  

gpu/igpu

Integrated GPUs

  

gpu/intel

Intel GPUs

  

gpu/nvidia

NVIDIA GPUs

  

help wanted

Extra hands or knowledge wanted

  

kind

bug

Something doesn't work as it should

  

kind

chore

Build, CI, dependencies, tidying

  

kind

docs

Documentation

  

kind

feature

A new feature or an improvement

  

kind

performance

Frame rate, frame time, loading, memory

  

kind

question

A question rather than a change

  

needs measurements

Waiting for before/after measurements

  

platform/linux

Affects Linux (a change for every system carries both Windows and Linux)

  

platform/macos

macOS (Apple silicon or Intel Macs)

  

platform/steam-deck

Steam Deck

  

platform/windows

Affects Windows (a change for every system carries both Windows and Linux)

  

preview

Maintainers: deploy a preview of this PR's website (read its changes first). Removed after the run.

  

priority

critical

Crashes, data loss, or blocks most players

  

priority

high

Important: next in line

  

priority

low

Nice to have

  

regression

Worked in an earlier build, broken in a newer one: highest priority, above other bugs

  

status

blocked

Waits on something else first

  

status

confirmed

Reproduced or agreed on

  

status

duplicate

Already reported or proposed

  

status

invalid

Not a problem in this project

  

status

needs-info

Waiting for more information from the reporter

  

status

wontfix

Will not be worked on

  

testing wanted

Wanted: a test on other hardware (posts a test request in #test-requests)

  

ci: approved

No labels

area/accessibility

area/audio

area/input

area/install

area/menu

area/renderer

area/saves

area/upscaling

beanstalk: approved @ 1697603

beanstalk: approved @ 2c5a62e

beanstalk: approved @ 4fd82b7

beanstalk: approved @ 64d6d09

beanstalk: approved @ 6f91fae

beanstalk: approved @ 70a78f9

beanstalk: approved @ 8d361dc

beanstalk: approved @ 9d8356e

beanstalk: approved @ abf2227

beanstalk: approved @ d82f202

beanstalk: approved @ e5f1e40

beanstalk: approved @ ee8ab5f

ci: approved

good first issue

gpu/amd

gpu/igpu

gpu/intel

gpu/nvidia

help wanted

kind

bug

kind

chore

kind

docs

kind

feature

kind

performance

kind

question

needs measurements

platform/linux

platform/macos

platform/steam-deck

platform/windows

preview

priority

critical

priority

high

priority

low

regression

status

blocked

status

confirmed

status

duplicate

status

invalid

status

needs-info

status

wontfix

testing wanted

ci: approved

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

MagicBeanDev/Longshot!561

No description provided.