mirror of
https://github.com/ChaiScript/ChaiScript.git
synced 2025-12-06 16:57:04 +08:00
Merge branch 'upgrade-cmake' into best_practices
This commit is contained in:
commit
63d1b16a7e
@ -323,37 +323,6 @@ endif()
|
|||||||
|
|
||||||
if(BUILD_TESTING)
|
if(BUILD_TESTING)
|
||||||
|
|
||||||
# Add catch tests macro
|
|
||||||
macro(ADD_CATCH_TESTS executable)
|
|
||||||
if (MSVC)
|
|
||||||
file(TO_NATIVE_PATH "${QT_LIBRARY_DIR}" QT_LIB_PATH)
|
|
||||||
set(NEWPATH "${QT_LIB_PATH};$ENV{PATH}")
|
|
||||||
else()
|
|
||||||
set(NEWPATH $ENV{PATH})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
get_target_property(target_files ${executable} SOURCES)
|
|
||||||
|
|
||||||
foreach(source ${target_files})
|
|
||||||
if(NOT "${source}" MATCHES "/moc_.*cxx")
|
|
||||||
string(REGEX MATCH .*cpp source "${source}")
|
|
||||||
if(source)
|
|
||||||
file(READ "${source}" contents)
|
|
||||||
string(REGEX MATCHALL "TEST_CASE\\([ ]*\"[^\"]+\"" found_tests ${contents})
|
|
||||||
foreach(hit ${found_tests})
|
|
||||||
string(REGEX REPLACE "TEST_CASE\\([ ]*(\"[^\"]+\").*" "\\1" test_name ${hit})
|
|
||||||
add_test(compiled.${test_name} "${executable}" ${test_name})
|
|
||||||
set_tests_properties(compiled.${test_name} PROPERTIES TIMEOUT 660 ENVIRONMENT "PATH=${NEWPATH}")
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
option(UNIT_TEST_LIGHT "Unit tests light (expect module loading failures)" FALSE)
|
option(UNIT_TEST_LIGHT "Unit tests light (expect module loading failures)" FALSE)
|
||||||
|
|
||||||
add_test(version_check chai -c "if(\"\\\${ version() };\\\${version_major()};\\\${version_minor()};\\\${version_patch()}\" != \"${CHAI_VERSION};${CPACK_PACKAGE_VERSION_MAJOR};${CPACK_PACKAGE_VERSION_MINOR};${CPACK_PACKAGE_VERSION_PATCH}\") { exit(-1) }")
|
add_test(version_check chai -c "if(\"\\\${ version() };\\\${version_major()};\\\${version_minor()};\\\${version_patch()}\" != \"${CHAI_VERSION};${CPACK_PACKAGE_VERSION_MAJOR};${CPACK_PACKAGE_VERSION_MINOR};${CPACK_PACKAGE_VERSION_PATCH}\") { exit(-1) }")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user