zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-01-13 20:21:48 +00:00
Code Activity

chore: remove ifdefs for disabling certain system tests

Browse Source 
* Previously reading written zones was disabled
* Reenable it to test for success in writing correct zones
This commit is contained in:
Jan Laupetin
2026-01-05 10:42:37 +00:00
parent 3fb4dc452e
commit 2d1cfbf43d
7 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/SystemTests/Game/IW3/SimpleZoneIW3.cpp
View File

@@ -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

3
test/SystemTests/Game/IW4/SimpleZoneIW4.cpp
View File

@@ -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

3
test/SystemTests/Game/IW5/SimpleZoneIW5.cpp
View File

@@ -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

3
test/SystemTests/Game/T5/SimpleZoneT5.cpp
View File

@@ -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

3
test/SystemTests/Game/T6/ExtendAndDereferenceT6.cpp
View File

@@ -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

3
test/SystemTests/Game/T6/ReuseGlobalAssetPoolsAssetsT6.cpp
View File

@@ -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

3
test/SystemTests/Game/T6/SimpleZoneT6.cpp
View File

@@ -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