mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-24 20:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Treat each test case as a unique test

Browse Source
This commit is contained in:
Chris Thrasher 2022-07-17 16:20:02 -06:00 committed by Vittorio Romeo
parent e2528de20a
commit 50cec7d2ed
3 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -251,6 +251,9 @@ if(SFML_OS_MACOSX)
set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
endif() endif()
# set the output directory for SFML DLLs and executables
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
# enable project folders # enable project folders
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake") set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")

12
cmake/Macros.cmake
View File

@ -330,17 +330,7 @@ function(sfml_add_test target SOURCES DEPENDS)
endif() endif()
# Add the test # Add the test
add_test(${target} ${target}) doctest_discover_tests(${target})
# If building shared libs on windows we must copy the dependencies into the folder
if (WIN32 AND BUILD_SHARED_LIBS)
foreach (DEPENDENCY ${DEPENDS})
add_custom_command(TARGET ${target} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:${DEPENDENCY}>
$<TARGET_FILE_DIR:${target}>)
endforeach()
endif()
endfunction() endfunction()
# Create an interface library for an external dependency. This virtual target can provide # Create an interface library for an external dependency. This virtual target can provide

30
test/CMakeLists.txt
View File

@ -6,6 +6,8 @@ FetchContent_Declare(doctest
GIT_TAG v2.4.9 GIT_TAG v2.4.9
) )
FetchContent_MakeAvailable(doctest) FetchContent_MakeAvailable(doctest)
list(APPEND CMAKE_MODULE_PATH ${doctest_SOURCE_DIR}/scripts/cmake)
include(doctest)
add_library(sfml-test-main STATIC add_library(sfml-test-main STATIC
DoctestMain.cpp DoctestMain.cpp
@ -76,31 +78,19 @@ set(AUDIO_SRC
) )
sfml_add_test(test-sfml-audio "${AUDIO_SRC}" SFML::Audio) sfml_add_test(test-sfml-audio "${AUDIO_SRC}" SFML::Audio)
if(SFML_OS_WINDOWS AND NOT SFML_USE_SYSTEM_DEPS)
add_custom_command(
TARGET test-sfml-audio
COMMENT "Copy OpenAL DLL"
PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/extlibs/bin/$<IF:$<BOOL:${ARCH_64BITS}>,x64,x86>/openal32.dll $<TARGET_FILE_DIR:test-sfml-audio>
)
endif()
# Automatically run the tests at the end of the build # Automatically run the tests at the end of the build
add_custom_target(runtests ALL add_custom_target(runtests ALL
DEPENDS test-sfml-system test-sfml-window test-sfml-graphics test-sfml-network test-sfml-audio DEPENDS test-sfml-system test-sfml-window test-sfml-graphics test-sfml-network test-sfml-audio
) )
if(SFML_OS_WINDOWS AND NOT SFML_USE_SYSTEM_DEPS)
# Copy the binaries of SFML dependencies
list(APPEND BINARIES
"openal32.dll"
)
foreach (BINARY ${BINARIES})
if(ARCH_32BITS)
list(APPEND BINARY_PATHS "${PROJECT_SOURCE_DIR}/extlibs/bin/x86/${BINARY}")
elseif(ARCH_64BITS)
list(APPEND BINARY_PATHS "${PROJECT_SOURCE_DIR}/extlibs/bin/x64/${BINARY}")
endif()
endforeach()
add_custom_command(TARGET runtests
COMMENT "Copy binaries"
POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy ${BINARY_PATHS} "$<TARGET_FILE_DIR:test-sfml-system>"
)
endif()
if(SFML_ENABLE_COVERAGE AND SFML_COMPILER_MSVC) if(SFML_ENABLE_COVERAGE AND SFML_COMPILER_MSVC)
# Try to find and use OpenCppCoverage for coverage reporting when building with MSVC # Try to find and use OpenCppCoverage for coverage reporting when building with MSVC
find_program(OpenCppCoverage_BINARY "OpenCppCoverage.exe") find_program(OpenCppCoverage_BINARY "OpenCppCoverage.exe")