From 564f9d6037d7c25ef17c54944036b4a1a7a6dfc0 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 16 Jan 2021 22:10:18 +0100 Subject: [PATCH] Specify tests to exclude in CI CMake builds Escape the | in AppVeyor bat file to prevent errors. --- build/tools/appveyor-test.bat | 6 +++--- build/tools/travis-ci.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index 18b9b9da22..f0319c16ed 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -44,14 +44,14 @@ echo. exit /b 0 :cmake_qt -set CMAKE_TEST_REGEX="test_base" +set CMAKE_TEST_REGEX="test_[drawing^|gui^|headers]" goto :cmake :cmake if "%CONFIGURATION%"=="" set CONFIGURATION=Release -if "%CMAKE_TEST_REGEX%"=="" set CMAKE_TEST_REGEX="test_[base|gui]" +if "%CMAKE_TEST_REGEX%"=="" set CMAKE_TEST_REGEX="test_drawing" cd ..\build_cmake -ctest -V -C %CONFIGURATION% -R %CMAKE_TEST_REGEX% --output-on-failure --interactive-debug-mode 0 . +ctest -V -C %CONFIGURATION% -E %CMAKE_TEST_REGEX% --output-on-failure --interactive-debug-mode 0 . if %errorlevel% NEQ 0 goto :error goto :eof diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index 435c81c704..6df3b2d8a3 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -44,7 +44,7 @@ case $wxTOOLSET in if [ "$wxCMAKE_TESTS" != "OFF" ]; then echo 'travis_fold:start:testing' echo 'Testing...' - ctest -V -C Debug -R "test_base" --output-on-failure --interactive-debug-mode 0 . + ctest -V -C Debug -E "test_drawing" --output-on-failure --interactive-debug-mode 0 . echo 'travis_fold:end:testing' fi