diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-19 12:54:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-19 12:54:58 (GMT) |
| commit | e7d3f154f001966f49add5b8b962833bb0664032 (patch) | |
| tree | 0a94acc2215aa4ee514b07ef1bb9c45fe39ab5f8 | |
| parent | c7b312cf13125b04e442cdcc2eb8725e8dfa5cbf (diff) | |
| parent | ea23db00f46356c7ed36a3c49db5de8e300db44e (diff) | |
| download | CMake-e7d3f154f001966f49add5b8b962833bb0664032.zip CMake-e7d3f154f001966f49add5b8b962833bb0664032.tar.gz CMake-e7d3f154f001966f49add5b8b962833bb0664032.tar.bz2 | |
Merge topic 'nightly-binary-no-ConsoleBuf-test'
ea23db00 Utilities/Release: Suppress KWSys ConsoleBuf test on Windows binaries
| -rw-r--r-- | Utilities/Release/win32_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/win64_release.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index a27efda..f54a4ca 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -27,6 +27,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) set(GIT_EXTRA "git config core.autocrlf true") if(CMAKE_CREATE_VERSION STREQUAL "nightly") # Some tests fail spuriously too often. - set(EXTRA_CTEST_ARGS "-E Qt5Autogen") + set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'") endif() include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index e39a610..bd2690f 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -28,6 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) set(GIT_EXTRA "git config core.autocrlf true") if(CMAKE_CREATE_VERSION STREQUAL "nightly") # Some tests fail spuriously too often. - set(EXTRA_CTEST_ARGS "-E Qt5Autogen") + set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'") endif() include(${path}/release_cmake.cmake) |