test thumb.gba

Author: evanwporter

.github/workflows/gba.yaml

@@ -140,10 +140,17 @@ jobs:
         run: |
           .\test_gba.exe --gtest_filter=*thumb_${{ matrix.test }}_json --test-dir=${{ github.workspace }}/tests/
 
-  arm_gba_test:
+  jsmolka_gba_tests:
     runs-on: windows-latest
     needs: build
 
+    strategy:
+      fail-fast: true
+      matrix:
+        test:
+          - ARM_GBA_tests
+          - Thumb_GBA_tests
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -155,4 +162,4 @@ jobs:
 
       - name: Run GBA tests
         run: |
-          .\test_gba.exe --gtest_filter=*ARM_GBA_tests* --test-dir=${{ github.workspace }}/tests/
+          .\test_gba.exe --gtest_filter=*${{ matrix.test }}* --test-dir=${{ github.workspace }}/tests/

cores/gba/tests/CMakeLists.txt

@@ -4,6 +4,7 @@ add_subdirectory(golden/nba/src/nba)
 
 add_subdirectory(cpu)
 add_subdirectory(arm.gba)
+add_subdirectory(thumb.gba)
 
 add_executable(test_gba
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
@@ -22,6 +23,7 @@ target_link_libraries(test_gba
     PRIVATE
         test_cpu_adv
         test_arm_gba
+        test_thumb_gba
         GTest::gtest
         libcommon
 )

cores/gba/tests/thumb.gba/CMakeLists.txt

@@ -0,0 +1,30 @@
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(GTest CONFIG REQUIRED)
+
+add_library(test_thumb_gba)
+
+target_sources(test_thumb_gba
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_thumb.cpp
+)
+
+target_link_libraries(test_thumb_gba PUBLIC
+    libgba
+    nba
+    GameboyAdvanceHarness
+    GTest::gtest
+    nlohmann_json::nlohmann_json
+    libcommon
+)
+
+target_include_directories(test_thumb_gba
+    PRIVATE
+        ${GBA_TESTS_CPP_DIR}
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/cores/gba/tests/golden/nba/src/nba/include
+        ${CMAKE_SOURCE_DIR}/cores/gba/tests/golden/nba/src/
+)
+
+target_compile_definitions(test_thumb_gba PUBLIC
+    TEST_DIR="${CMAKE_SOURCE_DIR}/tests/"
+)