Skip to content

test: main's red checks after #1866 and #2041 (finish-block 'a'; vsync fixture getenv deprecation) - #2109

Merged
NotRexed merged 2 commits into
mainfrom
test/finish-stub-a
Nov 11, 2026
Merged

NotRexed merged 2 commits into
mainfrom
test/finish-stub-a

Conversation

@NotRexed

Copy link
Copy Markdown
Owner

Main is red again. #1866 added this to the finish block of make_game.main():

if fsr_wanted(a, out) and getattr(a, "fetch_fsr_runtime", False):

tests/test_finish_output.py and tests/test_linux_update.py (test_a_packaged_build_puts_the_launcher_in_the_folder_and_the_game_in_bin) run that block on its own, without a, so both fail with NameError: name 'a' is not defined.

Both tests now pass an argument namespace with FSR off (fsr=False, no_fsr=False, update=None, fetch_fsr_runtime=False). The production code is unchanged.

Checked locally: test_finish_output passes. The test_linux_update case only runs on Linux; CI covers it. Locally on Windows that file has unrelated symlink failures that are the same before and after this change.

This unblocks #1999 and the other open PRs.

🤖 Generated with Claude Code

…ts arguments

#1866 added 'if fsr_wanted(a, out) and getattr(a, "fetch_fsr_runtime", False)' to main()'s finish block. test_finish_output and test_linux_update run that block on its own, with no 'a', so both failed with NameError on every OS. They now pass an argument namespace with FSR off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@NotRexed NotRexed changed the title test: the finish-block tests pass make_game's arguments (NameError 'a' after #1866) test: main's red checks after #1866 and #2041 (finish-block 'a'; vsync fixture getenv deprecation) Nov 11, 2026
@NotRexed

Copy link
Copy Markdown
Owner Author

Also: tests/test_vsync_row.py (from #2041) failed on Windows because its fixture uses getenv under -Werror. It now passes -D_CRT_SECURE_NO_WARNINGS, as the other fixture tests do.

…S (getenv deprecated on Windows, from #2041)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@NotRexed
NotRexed merged commit 7d24a73 into main Nov 11, 2026
12 checks passed
hckrman101 pushed a commit that referenced this pull request Nov 11, 2026
Eight checks fail on any PC without clang or the zstandard module,
instead of using the compiler `run_all.py` found or being skipped. Five
C++ tests default to `clang++` and two C tests to `clang` without a
`RUN_ALL_ARGS` line (for example `tests/test_3d_view_create_flags.py`
and `tests/test_nvn_null_pool.py`), and `nx2/test_nup_read_name.py`
imports `zstandard` without `RUN_ALL_MODULES`. `run_all.py` only checks
the tools a test names, so it can neither hand these its compiler nor
skip them, and on a g++-only box they show as failures.

Each now declares what it needs: `RUN_ALL_ARGS = ["--cxx", "{cxx}"]` on
the five (the runner's compiler, which is still clang++ where it is
installed), `["--cc", "clang"]` on the two C ones, and `RUN_ALL_MODULES
= ["zstandard"]` on the last. Nothing changes where clang and zstandard
are installed, as on CI.

`tests/test_prepare_cache_save.py` was a sixth C++ one; main gave it the
same line in #1980, so it is no longer part of this.

**Testing (Linux, g++ 15, no clang, no zstandard):** after the rebase,
the eight through `run_all.py`: the five C++ tests pass with g++, and
the other three are skipped with their reason. Before the rebase,
`tests/test_run_all_declarations.py` passed, and the full `run_all.py`
gave 298 passed, 61 skipped, with the only failures the two that #2109
has since fixed on main.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant