From 4ca84f9a971fb07706d7460ab3afe04a76ba752f Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sat, 9 Mar 2024 14:45:57 -0500 Subject: [PATCH] d/j3: ensure type-tests pass (#3414) Make this test run in CI as the game is not done yet, CI in master is failing because something was missed (forward declaration) --- goal_src/jak3/engine/gfx/sprite/sprite.gc | 3 +++ test/goalc/test_type_consistency.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/goal_src/jak3/engine/gfx/sprite/sprite.gc b/goal_src/jak3/engine/gfx/sprite/sprite.gc index a39b78b2a..abff81bcd 100644 --- a/goal_src/jak3/engine/gfx/sprite/sprite.gc +++ b/goal_src/jak3/engine/gfx/sprite/sprite.gc @@ -12,6 +12,9 @@ (glow 1) ) +(declare-type sprite-hvdf-data structure) +(declare-type sprite-hvdf-control structure) +(declare-type sprite-aux-list basic) (define-extern *sprite-hvdf-data* sprite-hvdf-data) (define-extern *sprite-hvdf-control* sprite-hvdf-control) (define-extern *sprite-aux-list* sprite-aux-list) diff --git a/test/goalc/test_type_consistency.cpp b/test/goalc/test_type_consistency.cpp index 3671302dc..516efd9fb 100644 --- a/test/goalc/test_type_consistency.cpp +++ b/test/goalc/test_type_consistency.cpp @@ -37,7 +37,7 @@ TEST(Jak2TypeConsistency, MANUAL_TEST_TypeConsistencyWithBuildFirst) { compiler.run_test_no_load("decompiler/config/jak2/all-types.gc"); } -TEST(Jak3TypeConsistency, MANUAL_TEST_TypeConsistencyWithBuildFirst) { +TEST(Jak3TypeConsistency, TypeConsistencyWithBuildFirst) { Compiler compiler(GameVersion::Jak3); compiler.enable_throw_on_redefines(); add_common_expected_type_mismatches(compiler);