j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake

Browse source
This commit is contained in:
Isaac Nickaein 2019-06-22 21:05:15 +04:30
parent f559142008
commit 0a137b78ac
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appveyor.yml
View file

@ -103,4 +103,6 @@ build_script:
- cmake --build . --config "%configuration%" - cmake --build . --config "%configuration%"
test_script: test_script:
- ctest -C "%configuration%" -V -j # Set 1 hour timeout to avoid the occasional
# timeouts on test-unicode_all
- ctest --timeout 3600 -C "%configuration%" -V -j

6
test/CMakeLists.txt
View file

@ -133,12 +133,6 @@ foreach(file ${files})
) )
set_tests_properties("${testcase}_all" PROPERTIES LABELS "all") set_tests_properties("${testcase}_all" PROPERTIES LABELS "all")
# Increase timeout for test-unicode_all on Debug build
string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
if (("${testcase}" STREQUAL "test-unicode") AND (uppercase_CMAKE_BUILD_TYPE STREQUAL DEBUG))
set_tests_properties("${testcase}_all" PROPERTIES TIMEOUT 3600)
endif()
if(JSON_Valgrind) if(JSON_Valgrind)
add_test(NAME "${testcase}_valgrind" add_test(NAME "${testcase}_valgrind"
COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER} COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER}