Merge topic 'nightly-binary-no-ConsoleBuf-test'
ea23db00
Utilities/Release: Suppress KWSys ConsoleBuf test on Windows binaries
This commit is contained in:
commit
e7d3f154f0
|
@ -27,6 +27,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
set(GIT_EXTRA "git config core.autocrlf true")
|
set(GIT_EXTRA "git config core.autocrlf true")
|
||||||
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
|
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
|
||||||
# Some tests fail spuriously too often.
|
# Some tests fail spuriously too often.
|
||||||
set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
|
set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'")
|
||||||
endif()
|
endif()
|
||||||
include(${path}/release_cmake.cmake)
|
include(${path}/release_cmake.cmake)
|
||||||
|
|
|
@ -28,6 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
set(GIT_EXTRA "git config core.autocrlf true")
|
set(GIT_EXTRA "git config core.autocrlf true")
|
||||||
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
|
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
|
||||||
# Some tests fail spuriously too often.
|
# Some tests fail spuriously too often.
|
||||||
set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
|
set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'")
|
||||||
endif()
|
endif()
|
||||||
include(${path}/release_cmake.cmake)
|
include(${path}/release_cmake.cmake)
|
||||||
|
|
Loading…
Reference in New Issue