From beb8dd50b8466ff0030d45251661bca39f784945 Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 13 Aug 2024 20:47:06 -0400 Subject: [PATCH] chore: Update test engine linkage and include integration::TestEditor in yaze_test --- cmake/gtest.cmake | 11 +++++++++++ src/test/CMakeLists.txt | 17 ++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 cmake/gtest.cmake diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake new file mode 100644 index 00000000..6d534a93 --- /dev/null +++ b/cmake/gtest.cmake @@ -0,0 +1,11 @@ +# GoogleTest ------------------------------------------------------------------ +include(FetchContent) +FetchContent_Declare( + googletest + URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip +) + +# For Windows: Prevent overriding the parent project's compiler/linker settings +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +FetchContent_MakeAvailable(googletest) +enable_testing() \ No newline at end of file diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 7a472099..fb4ea711 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,26 +1,13 @@ -# GoogleTest ------------------------------------------------------------------ -include(FetchContent) -FetchContent_Declare( - googletest - URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip -) - -# For Windows: Prevent overriding the parent project's compiler/linker settings -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -FetchContent_MakeAvailable(googletest) -enable_testing() - +include(../cmake/gtest.cmake) add_executable( yaze_test test/yaze_test.cc test/libc_test.cc test/rom_test.cc - # test/emu/cpu_test.cc - # test/emu/spc700_test.cc - # test/emu/ppu_test.cc test/gfx/compression_test.cc test/gfx/snes_palette_test.cc + test/integration/test_editor.cc test/zelda3/room_object_test.cc test/zelda3/sprite_builder_test.cc cli/command_handler.cc