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

nlohmann · Jun 22, 2019 · 0a137b7 · 0a137b7
1 parent f559142
commit 0a137b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -103,4 +103,6 @@ build_script:
   - cmake --build . --config "%configuration%"
 
 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
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -133,12 +133,6 @@ foreach(file ${files})
     )
     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)
         add_test(NAME "${testcase}_valgrind"
           COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER}