diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-20 13:36:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-20 13:37:24 (GMT) |
| commit | 366df05ac028772097ac4d1aed2752d8a821b554 (patch) | |
| tree | 442cb8f560597b54defe0b9aa7313c9dd12241fa | |
| parent | 22db0d5c6e45d3ce247c2ebe5e5c54810363486f (diff) | |
| parent | bab868be135b721a5867275f8ffce38cb7b28d06 (diff) | |
| download | CMake-366df05ac028772097ac4d1aed2752d8a821b554.zip CMake-366df05ac028772097ac4d1aed2752d8a821b554.tar.gz CMake-366df05ac028772097ac4d1aed2752d8a821b554.tar.bz2 | |
Merge topic 'rel-win-nightly'
bab868be13 Utilities/Release: Skip spurious ExternalData test for nightly binary
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2404
| -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 f9e35a5..2e817d9 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -39,6 +39,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 'ConsoleBuf'") + set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'") endif() include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 02e4096..33af830 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -39,6 +39,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 'ConsoleBuf'") + set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'") endif() include(${path}/release_cmake.cmake) |