Skip to content

Commit

Permalink
Merge pull request #13 from ProtectedVariable/enable_ci_tests
Browse files Browse the repository at this point in the history
uncomment test part
  • Loading branch information
ProtectedVariable authored Dec 11, 2024
2 parents a3595af + 1ee1aeb commit 4762d3a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build . --config $BUILD_TYPE

#- name: Test
# working-directory: ${{runner.workspace}}/build
# shell: bash
- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
# run: ctest -C $BUILD_TYPE
run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
set(CMAKE_CXX_STANDARD 20)

include(cmake/fetch_dependencies.cmake)

enable_testing()
set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
Expand Down
8 changes: 6 additions & 2 deletions ICE/IO/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ target_link_libraries(MeshLoaderTestSuite
gtest_main
io)

file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/cube.obj DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

add_custom_command(
TARGET MeshLoaderTestSuite POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/cube.obj"
$<TARGET_FILE_DIR:MeshLoaderTestSuite>
)

2 changes: 1 addition & 1 deletion ICE/IO/test/MeshLoaderTest.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <NoneGraphicsFactory.h>
#include <gtest/gtest.h>

#include "MeshLoader.h"
#include <NoneGraphicsFactory.h>

using namespace ICE;

Expand Down

0 comments on commit 4762d3a

Please sign in to comment.