From 7dd80536972c532d9b008f71864e2cc61c4292b5 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sat, 24 Sep 2022 15:56:53 -0400 Subject: [PATCH] fix test failure and stop running manual tests in CI (#1912) --- decompiler/config/jak2/all-types.gc | 2 ++ goal_src/jak2/levels/city/common/nav-graph-h.gc | 15 +++++++++++++++ test/CMakeLists.txt | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 4718cb185b..552645c99b 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -47561,6 +47561,7 @@ ) ) +;; +++nav-graph-h:nav-node-flag-byte (defenum nav-node-flag-byte "The same as [[nav-node-flag]] but more compact" :type uint8 @@ -47570,6 +47571,7 @@ (pedestrian 2) (selected 3) (hidden 4)) +;; ---nav-graph-h:nav-node-flag-byte (deftype nav-node (structure) ( diff --git a/goal_src/jak2/levels/city/common/nav-graph-h.gc b/goal_src/jak2/levels/city/common/nav-graph-h.gc index c002b7ad4b..be4899aae4 100644 --- a/goal_src/jak2/levels/city/common/nav-graph-h.gc +++ b/goal_src/jak2/levels/city/common/nav-graph-h.gc @@ -5,6 +5,21 @@ ;; name in dgo: nav-graph-h ;; dgos: CWI +(declare-type nav-node structure) + +;; +++nav-node-flag-byte +(defenum nav-node-flag-byte + "The same as [[nav-node-flag]] but more compact" + :type uint8 + :bitfield #t + (visited 0) + (blocked 1) + (pedestrian 2) + (selected 3) + (hidden 4)) +;; ---nav-node-flag-byte + + ;; DECOMP BEGINS (deftype nav-branch (structure) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 949435a2b9..a8700f5044 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -51,7 +51,7 @@ if(UNIX AND CMAKE_COMPILER_IS_GNUCXX AND CODE_COVERAGE) include(CodeCoverage) append_coverage_compiler_flags() setup_target_for_coverage_lcov(NAME goalc-test_coverage - EXECUTABLE goalc-test --gtest_color=yes --gtest_brief=1 + EXECUTABLE goalc-test --gtest_color=yes --gtest_brief=1 --gtest_filter="-*MANUAL_TEST*" DEPENDENCIES goalc-test EXCLUDE "third-party/*" "/usr/include/*") endif()