From 2d1cfbf43de801c70f6571ee0e22ed8fa5d793e5 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Mon, 5 Jan 2026 10:42:37 +0000 Subject: [PATCH] chore: remove ifdefs for disabling certain system tests * Previously reading written zones was disabled * Reenable it to test for success in writing correct zones --- test/SystemTests/Game/IW3/SimpleZoneIW3.cpp | 3 --- test/SystemTests/Game/IW4/SimpleZoneIW4.cpp | 3 --- test/SystemTests/Game/IW5/SimpleZoneIW5.cpp | 3 --- test/SystemTests/Game/T5/SimpleZoneT5.cpp | 3 --- test/SystemTests/Game/T6/ExtendAndDereferenceT6.cpp | 3 --- test/SystemTests/Game/T6/ReuseGlobalAssetPoolsAssetsT6.cpp | 3 --- test/SystemTests/Game/T6/SimpleZoneT6.cpp | 3 --- 7 files changed, 21 deletions(-) diff --git a/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp b/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp index 4092878a..d2d989b7 100644 --- a/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp +++ b/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp @@ -46,8 +46,6 @@ namespace REQUIRE(linkerResult); - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 const auto expectedZonePath = (fs::path(outputPath) / "SimpleZoneIW3.ff").string(); auto maybeZone = ZoneLoading::LoadZone(expectedZonePath, std::nullopt); REQUIRE(maybeZone); @@ -60,6 +58,5 @@ namespace REQUIRE(zone->m_name == "SimpleZoneIW3"); REQUIRE(pools->GetTotalAssetCount() == 1); REQUIRE(pools->m_raw_file->GetAsset("SimpleZone.txt")); -#endif } } // namespace diff --git a/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp b/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp index f89314a7..b41799ee 100644 --- a/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp +++ b/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp @@ -46,8 +46,6 @@ namespace REQUIRE(linkerResult); - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 const auto expectedZonePath = (fs::path(outputPath) / "SimpleZoneIW4.ff").string(); auto maybeZone = ZoneLoading::LoadZone(expectedZonePath, std::nullopt); REQUIRE(maybeZone); @@ -60,6 +58,5 @@ namespace REQUIRE(zone->m_name == "SimpleZoneIW4"); REQUIRE(pools->GetTotalAssetCount() == 1); REQUIRE(pools->m_raw_file->GetAsset("SimpleZone.txt")); -#endif } } // namespace diff --git a/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp b/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp index bd3c80d3..3d5979ce 100644 --- a/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp +++ b/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp @@ -46,8 +46,6 @@ namespace REQUIRE(linkerResult); - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 const auto expectedZonePath = (fs::path(outputPath) / "SimpleZoneIW5.ff").string(); auto maybeZone = ZoneLoading::LoadZone(expectedZonePath, std::nullopt); REQUIRE(maybeZone); @@ -60,6 +58,5 @@ namespace REQUIRE(zone->m_name == "SimpleZoneIW5"); REQUIRE(pools->GetTotalAssetCount() == 1); REQUIRE(pools->m_raw_file->GetAsset("SimpleZone.txt")); -#endif } } // namespace diff --git a/test/SystemTests/Game/T5/SimpleZoneT5.cpp b/test/SystemTests/Game/T5/SimpleZoneT5.cpp index 7ba904b0..6f85e0de 100644 --- a/test/SystemTests/Game/T5/SimpleZoneT5.cpp +++ b/test/SystemTests/Game/T5/SimpleZoneT5.cpp @@ -46,8 +46,6 @@ namespace REQUIRE(linkerResult); - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 const auto expectedZonePath = (fs::path(outputPath) / "SimpleZoneT5.ff").string(); auto maybeZone = ZoneLoading::LoadZone(expectedZonePath, std::nullopt); REQUIRE(maybeZone); @@ -60,6 +58,5 @@ namespace REQUIRE(zone->m_name == "SimpleZoneT5"); REQUIRE(pools->GetTotalAssetCount() == 1); REQUIRE(pools->m_raw_file->GetAsset("SimpleZone.txt")); -#endif } } // namespace diff --git a/test/SystemTests/Game/T6/ExtendAndDereferenceT6.cpp b/test/SystemTests/Game/T6/ExtendAndDereferenceT6.cpp index b83e2fa6..17ad84bc 100644 --- a/test/SystemTests/Game/T6/ExtendAndDereferenceT6.cpp +++ b/test/SystemTests/Game/T6/ExtendAndDereferenceT6.cpp @@ -115,8 +115,6 @@ namespace REQUIRE(material->Asset()->techniqueSet->techniques[T6::TECHNIQUE_UNLIT]); } - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 TEST_CASE("Extend and dereference(T6)", "[t6][system][simple]") { const auto testDir = oat::paths::GetSystemTestsDirectory() / "Game/T6/ExtendAndDereference"; @@ -126,5 +124,4 @@ namespace BuildCombinedZone(testDir, outputPath); CheckCombinedZoneContent(outputPath); } -#endif } // namespace diff --git a/test/SystemTests/Game/T6/ReuseGlobalAssetPoolsAssetsT6.cpp b/test/SystemTests/Game/T6/ReuseGlobalAssetPoolsAssetsT6.cpp index eb553278..44975b54 100644 --- a/test/SystemTests/Game/T6/ReuseGlobalAssetPoolsAssetsT6.cpp +++ b/test/SystemTests/Game/T6/ReuseGlobalAssetPoolsAssetsT6.cpp @@ -122,8 +122,6 @@ namespace REQUIRE(zone->m_script_strings.Value(xmodel->Asset()->boneNames[2]) == "EarRight2"); } - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 TEST_CASE("Reuse assets from global asset pool(T6)", "[t6][system][simple]") { const auto testDir = oat::paths::GetSystemTestsDirectory() / "Game/T6/ReuseGlobalAssetPoolsAssets"; @@ -133,5 +131,4 @@ namespace BuildTestZone(testDir, outputPath); CheckTestZoneContent(outputPath); } -#endif } // namespace diff --git a/test/SystemTests/Game/T6/SimpleZoneT6.cpp b/test/SystemTests/Game/T6/SimpleZoneT6.cpp index e2eae4c9..8cb4076f 100644 --- a/test/SystemTests/Game/T6/SimpleZoneT6.cpp +++ b/test/SystemTests/Game/T6/SimpleZoneT6.cpp @@ -46,8 +46,6 @@ namespace REQUIRE(linkerResult); - // x64 for now produces invalid zones, don't try to load them yet -#ifdef ARCH_x86 const auto expectedZonePath = (fs::path(outputPath) / "SimpleZoneT6.ff").string(); auto maybeZone = ZoneLoading::LoadZone(expectedZonePath, std::nullopt); REQUIRE(maybeZone); @@ -60,6 +58,5 @@ namespace REQUIRE(zone->m_name == "SimpleZoneT6"); REQUIRE(pools->GetTotalAssetCount() == 1); REQUIRE(pools->m_raw_file->GetAsset("SimpleZone.txt")); -#endif } } // namespace