[Cmake-commits] CMake branch, next, updated. v3.6.2-2184-g8b59ace
Brad King
brad.king at kitware.com
Mon Sep 19 08:40:54 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8b59ace9aca2a629c9b4acbdae648ed0db2379b0 (commit)
via ea23db00f46356c7ed36a3c49db5de8e300db44e (commit)
from 0c1355ff6b6e05324b7d9d28d9b72d91e3ef9e20 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b59ace9aca2a629c9b4acbdae648ed0db2379b0
commit 8b59ace9aca2a629c9b4acbdae648ed0db2379b0
Merge: 0c1355f ea23db0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 19 08:40:53 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 19 08:40:53 2016 -0400
Merge topic 'nightly-binary-no-ConsoleBuf-test' into next
ea23db00 Utilities/Release: Suppress KWSys ConsoleBuf test on Windows binaries
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea23db00f46356c7ed36a3c49db5de8e300db44e
commit ea23db00f46356c7ed36a3c49db5de8e300db44e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Sep 18 09:35:27 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 19 08:40:10 2016 -0400
Utilities/Release: Suppress KWSys ConsoleBuf test on Windows binaries
The test fails spuriously too often. Additional work on the test
will be needed to make it more reliable. For now just skip the
test when building nightly binaries so they can complete.
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)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list