Compile and run the engine tests on the CI

.github/workflows/build-engine-linux.yml

@@ -44,7 +44,7 @@ jobs:
           ccache-
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CORE_SAMPLES=ON -DBUILD_CORE_TESTS=ON -DBUILD_ENGINE_SAMPLES=ON -DUSE_CLANG_TIDY=OFF
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CORE_SAMPLES=ON -DBUILD_CORE_TESTS=ON -DBUILD_ENGINE_TESTS=ON -DBUILD_ENGINE_SAMPLES=ON -DUSE_CLANG_TIDY=OFF
       shell: bash
       env:
         CC:   gcc-11
@@ -62,7 +62,10 @@ jobs:
       run: |
         ccache -s # Print current cache stats
 
-    - name: Test
+    - name: Test Core
       working-directory: ${{github.workspace}}/build/core/tests
       run: ./cubos-core-tests
 
+    - name: Test Engine
+      working-directory: ${{github.workspace}}/build/engine/tests
+      run: ./cubos-engine-tests

.github/workflows/build-engine-macos.yml

@@ -44,7 +44,7 @@ jobs:
           ccache-
 
     - name: Configure CMake
-      run: CC=$(brew --prefix llvm@14)/bin/clang CXX=$(brew --prefix llvm@14)/bin/clang++ cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGLFW_USE_SUBMODULE=OFF -DBUILD_CORE_SAMPLES=ON -DBUILD_CORE_TESTS=ON -DBUILD_ENGINE_SAMPLES=ON -DUSE_CLANG_TIDY=OFF
+      run: CC=$(brew --prefix llvm@14)/bin/clang CXX=$(brew --prefix llvm@14)/bin/clang++ cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGLFW_USE_SUBMODULE=OFF -DBUILD_CORE_SAMPLES=ON -DBUILD_CORE_TESTS=ON -DBUILD_ENGINE_TESTS=ON -DBUILD_ENGINE_SAMPLES=ON -DUSE_CLANG_TIDY=OFF
       shell: bash
 
     - name: CCache Prolog
@@ -59,7 +59,10 @@ jobs:
       run: |
         ccache -s # Print current cache stats
 
-    - name: Test
+    - name: Test Core
       working-directory: ${{github.workspace}}/build/core/tests
       run: ./cubos-core-tests
-
+
+    - name: Test Engine
+      working-directory: ${{github.workspace}}/build/engine/tests
+      run: ./cubos-engine-tests

.github/workflows/build-engine-windows.yml

@@ -48,7 +48,7 @@ jobs:
       run: cmake -E make_directory ${{github.workspace}}\build
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}\build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CORE_SAMPLES=ON -DBUILD_CORE_TESTS=ON -DBUILD_ENGINE_SAMPLES=ON -DUSE_CLANG_TIDY=OFF -DCCACHE_VERSION="${{env.CCACHE_VERSION}}"
+      run: cmake -B ${{github.workspace}}\build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CORE_SAMPLES=ON -DBUILD_CORE_TESTS=ON -DBUILD_ENGINE_TESTS=ON -DBUILD_ENGINE_SAMPLES=ON -DUSE_CLANG_TIDY=OFF -DCCACHE_VERSION="${{env.CCACHE_VERSION}}"
 
     - name: CCache Prolog
       run: |-
@@ -62,6 +62,8 @@ jobs:
       run: |
         ccache -s # Print current cache stats
 
-    - name: Test
+    - name: Test Core
       run: ${{github.workspace}}\build\core\tests\Release\cubos-core-tests.exe
 
+    - name: Test Engine
+      run: ${{github.workspace}}\build\engine\tests\Release\cubos-engine-tests.exe

.gitmodules

@@ -11,7 +11,7 @@
 	path = core/lib/stduuid
 	url = https://github.com/mariusbancila/stduuid.git
 [submodule "core/lib/doctest"]
-	path = core/lib/doctest
+	path = lib/doctest
 	url = https://github.com/doctest/doctest
 [submodule "docs/css/m.css"]
 	path = docs/css

CMakeLists.txt

@@ -8,8 +8,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
 set(CMAKE_CXX_STANDARD 20)
 
-# Should clang-tidy errors be automatically fixed?
 option(FIX_CLANG_TIDY_ERRORS "Automatically fix clang-tidy errors" OFF)
+option(DOCTEST_USE_SUBMODULE "Compile doctest from source?" ON)
 
 # Enable coverage reports
 option(ENABLE_COVERAGE "Generate coverage report" OFF)
@@ -99,6 +99,14 @@ function(cubos_common_target_options target)
     endif()
 endfunction()
 
+# Add doctest as a submodule if it is not installed
+
+if (DOCTEST_USE_SUBMODULE)
+    add_subdirectory(lib/doctest)
+else ()
+    find_package(doctest REQUIRED)
+endif ()
+
 add_subdirectory(core)
 add_subdirectory(tools)
 add_subdirectory(engine)

core/CMakeLists.txt

@@ -8,7 +8,6 @@ if (WITH_GLFW)
 endif ()
 option(WITH_OPENAL "With OpenAL?" ON)
 option(GLM_USE_SUBMODULE "Compile GLM from source?" ON)
-option(DOCTEST_USE_SUBMODULE "Compile doctest from source?" ON)
 
 set(CUBOS_CORE_ECS_MAX_COMPONENTS "63" CACHE STRING "The maximum number of components registered in an ECS world.")
 set(CUBOS_CORE_DISPATCHER_MAX_CONDITIONS "64" CACHE STRING "The maximum number of conditions available for the dispatcher.")
@@ -169,12 +168,6 @@ else ()
     find_package(glm REQUIRED)
 endif ()
 
-if (DOCTEST_USE_SUBMODULE)
-    add_subdirectory(lib/doctest)
-else ()
-    find_package(doctest REQUIRED)
-endif ()
-
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 add_subdirectory(lib/json)
 

engine/tests/CMakeLists.txt

@@ -4,11 +4,9 @@
 add_executable(
     cubos-engine-tests
     main.cpp
-
-    collisions/aabb.cpp
 )
 
 target_link_libraries(cubos-engine-tests cubos-engine doctest::doctest)
 cubos_common_target_options(cubos-engine-tests)
 
-add_test(NAME cubos-engine-tests COMMAND cubos-engine-tests)
+add_test(NAME cubos-engine-tests COMMAND cubos-engine-tests)