try to fix tests

harmonytf · Oct 24, 2024 · fca9721 · fca9721
1 parent 9e31447
commit fca9721
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 20 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -77,8 +77,8 @@ jobs:
         path: build/
 
     - name: Test
-      #working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}/tests
       # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      #run: ctest --build-config ${{ matrix.build_type }}
-      run: ./ci/test.ps1
+      run: ctest --build-config ${{ matrix.build_type }}
+      #run: ./ci/test.ps1
diff --git a/.gitignore b/.gitignore
@@ -37,5 +37,19 @@
 # Generated documentation
 /docs
 
-# VSCode configs
+# VS Code settings
 /.vscode
+/.cache
+
+# Visual Studio work directory
+/.vs/
+# Visual Studio build directory
+/out/
+
+# CMake build directory
+/build
+
+# appimage executables
+*.AppImage
+
+/CMakeUserPresets.json
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ set(PKG_TESTS_TFO_NEXON_SOURCES
     "tfo/nexon/test_pkgindex.cpp"
     "tfo/nexon/settings.hpp")
 
-set(PKG_TESTS_SOURCES_BASE "test_main.cpp" "utils.cpp")
+set(PKG_TESTS_SOURCES_BASE "utils.cpp")
 
 set(PKG_TESTS_HEADERS_BASE "utils.hpp")
 
@@ -45,13 +45,7 @@ target_include_directories(pkg_test
 target_include_directories(pkg_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(${PKG_LIB_CATCH_DIR} catch)
-target_link_libraries(pkg_test Catch2::Catch2)
-
-if(PKG_USE_CLANG_FSAPI)
-  target_link_libraries(pkg_test c++abi c++fs)
-elseif(NOT MSVC)
-  target_link_libraries(pkg_test stdc++fs)
-endif()
+target_link_libraries(pkg_test Catch2::Catch2WithMain)
 
 target_link_libraries(pkg_test uncso2)
 
@@ -63,3 +57,13 @@ file(GLOB PKG_TEST_REQUIRED_FILES "${CMAKE_CURRENT_SOURCE_DIR}/gamefiles/*")
 foreach(file ${PKG_TEST_REQUIRED_FILES})
   configure_file(${file} "${CMAKE_CURRENT_BINARY_DIR}/" COPYONLY)
 endforeach()
+
+add_custom_command(
+        TARGET pkg_test POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${CMAKE_CURRENT_BINARY_DIR}/../uncso2.dll
+                ${CMAKE_CURRENT_BINARY_DIR})
+
+include(CTest)
+include(Catch)
+catch_discover_tests(pkg_test)
diff --git a/tests/cso2/nexon/test_encfile.cpp b/tests/cso2/nexon/test_encfile.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <filesystem>
 #include <fstream>

diff --git a/tests/cso2/nexon/test_lzmatex.cpp b/tests/cso2/nexon/test_lzmatex.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <filesystem>
 #include <fstream>

diff --git a/tests/cso2/nexon/test_pkgfile.cpp b/tests/cso2/nexon/test_pkgfile.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <iostream>
 #include <string_view>

diff --git a/tests/cso2/nexon/test_pkgindex.cpp b/tests/cso2/nexon/test_pkgindex.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <fstream>
 #include <iostream>

diff --git a/tests/test_main.cpp b/tests/test_main.cpp
diff --git a/tests/tfo/nexon/test_pkgfile.cpp b/tests/tfo/nexon/test_pkgfile.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <iostream>
 #include <string_view>

diff --git a/tests/tfo/nexon/test_pkgindex.cpp b/tests/tfo/nexon/test_pkgindex.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <fstream>
 #include <iostream>