From e7a88b2d7fdef51ce2eb36a81506850cba5f4ce4 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 3 May 2020 19:33:01 +0200 Subject: [PATCH] :green_heart: fix AppVeyor and Travis builds --- appveyor.yml | 2 +- test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b1bdf43f..9c380dcd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -123,4 +123,4 @@ test_script: # as it is extremely slow to run and cause # occasional timeouts on AppVeyor. # More info: https://github.com/nlohmann/json/pull/1570 - - if "%configuration%"=="Debug" ctest --exclude-regex "test-unicode_all" -C "%configuration%" -V -j + - if "%configuration%"=="Debug" ctest --exclude-regex "test-unicode" -C "%configuration%" -V -j diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e40b24de..838cce53 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -162,7 +162,7 @@ foreach(file ${files}) if(JSON_Valgrind) add_test(NAME "${testcase}_valgrind" - COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER} --no-skip + COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) set_tests_properties("${testcase}_valgrind" PROPERTIES LABELS "valgrind")