From baa3562eabbed2d883447ae21de30dec0576d178 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 16 Oct 2026 21:57:42 +0200 Subject: [PATCH] Fix two data tests and the Windows package allowlist for 0.1 - ui_series_records_tests installs the authored fixture tables, since the public tree no longer carries built-in schedule tables (uncaught throw). - training_camp_app_tests no longer compares against the removed built-in resort constants; it checks that the content comes from the EXE. - make_package.py accepts the api-ms-win-core forwarders that the app-local UCRT redist installs (Windows CI packaging failure). Co-Authored-By: Claude Opus 5.5 --- src/ui/series_records_tests.cpp | 3 +++ tests/training_camp_app_tests.cpp | 10 ++++------ tools/package/make_package.py | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ui/series_records_tests.cpp b/src/ui/series_records_tests.cpp index 761012e..b15e51a 100644 --- a/src/ui/series_records_tests.cpp +++ b/src/ui/series_records_tests.cpp @@ -9,6 +9,7 @@ #include #include "game/schedule.hpp" +#include "../../tests/fixture_tables.hpp" namespace { void require(bool condition, const char* message) { @@ -21,6 +22,8 @@ void require(bool condition, const char* message) { int main(int argc, char** argv) { using namespace bmh; + // The public tree carries no fixture tables; install the authored test copy. + set_fixture_tables(test::authored_fixture_tables()); GameState game; game.manager_records.assign(5 * 0xb0c, 0); game.manager_records[0x290] = 0; diff --git a/tests/training_camp_app_tests.cpp b/tests/training_camp_app_tests.cpp index 1433ca8..191e1d0 100644 --- a/tests/training_camp_app_tests.cpp +++ b/tests/training_camp_app_tests.cpp @@ -51,12 +51,10 @@ void content_lifecycle(const std::filesystem::path& data) { "fresh save loading restores resort content from the selected EXE, not defaults or save bytes"); auto projected = training_camp_from_game(reloaded.state(), exe, 0, 1); check(projected.quality == expected_quality, "UI stars project the same table that booking effects use"); - if (exe.cstring(::bmh::layout::CurrencySuffixText) == " EU") { - GameState defaults; - check(expected_prices == defaults.training_camp_base_prices && - expected_quality == defaults.training_camp_quality, - "German supported edition price and quality content stays byte-identical to the former constants"); - } + // GameState carries no built-in resort content; a career must take it from the EXE. + GameState defaults; + check(expected_prices != defaults.training_camp_base_prices, + "resort prices come from the selected EXE, not from empty defaults"); } } diff --git a/tools/package/make_package.py b/tools/package/make_package.py index cf7f46a..681fe87 100644 --- a/tools/package/make_package.py +++ b/tools/package/make_package.py @@ -26,9 +26,10 @@ def validate(directory, windows): allowed |= (len(relative.parts) >= 2 and relative.parts[0] == 'docs' and 'licenses' not in relative.parts and file.suffix in {'.md', '.txt', '.csv'} and all(part not in {'analyses', 'agents', 'manuals', 'validation'} for part in relative.parts)) + # App-local UCRT deployment must ship the whole redist set, core forwarders included. allowed |= (windows and len(relative.parts) == 1 and bool(re.fullmatch(r'(?:vcruntime\d+(?:_\d+)?|msvcp\d+(?:_\d+|_atomic_wait|_codecvt_ids)?|' - r'concrt\d+|ucrtbase|api-ms-win-crt-[a-z0-9-]+)\.dll', file.name, re.I))) + r'concrt\d+|ucrtbase|api-ms-win-(?:crt|core)-[a-z0-9-]+)\.dll', file.name, re.I))) if not allowed: raise RuntimeError('Unexpected package entry: ' + relative.as_posix()) required = products | documents | {'docs/licenses/' + name for name in licenses}