External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚗️ try disabling concurrency

Browse Source
This commit is contained in:
Niels Lohmann 2021-07-20 13:55:05 +02:00
parent 18874a9873
commit b7b617f0c0
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ci.cmake
View File

@ -494,7 +494,7 @@ add_custom_target(ci_test_clang_sanitizer
-DJSON_BuildTests=ON -DJSON_BuildTests=ON
-S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer
COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_sanitizer COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_sanitizer
COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure --repeat until-pass:1 COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
COMMENT "Compile and test with sanitizers" COMMENT "Compile and test with sanitizers"
) )

4
test/CMakeLists.txt
View File

@ -81,6 +81,10 @@ foreach(file ${files})
endif() endif()
set_tests_properties("${testcase}" PROPERTIES LABELS "all" FIXTURES_REQUIRED TEST_DATA) set_tests_properties("${testcase}" PROPERTIES LABELS "all" FIXTURES_REQUIRED TEST_DATA)
if (${testcase} STREQUAL "test-unicode")
set_tests_properties("${testcase}" PROPERTIES RUN_SERIAL ON)
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}