[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-609-ge527693
Kitware Robot
kwrobot at kitware.com
Thu Mar 23 15:35:02 EDT 2017
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 e5276930c157cdaf147f97f5dd2bd99f4752fbce (commit)
via 07f2682c6c2398c4f0317dc03a36368c0ce64f00 (commit)
from 299f570d20bc217d426b89f648a45dd5bbdf092e (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=e5276930c157cdaf147f97f5dd2bd99f4752fbce
commit e5276930c157cdaf147f97f5dd2bd99f4752fbce
Merge: 299f570 07f2682
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 23 19:31:51 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Mar 23 15:31:59 2017 -0400
Stage topic 'suppress-xcode-error'
Topic-id: 23217
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/617
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07f2682c6c2398c4f0317dc03a36368c0ce64f00
commit 07f2682c6c2398c4f0317dc03a36368c0ce64f00
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Thu Mar 23 16:53:05 2017 +0100
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Thu Mar 23 16:53:12 2017 +0100
RunCMake: Ignore cmakexbuild warnings in tests
Encountered on master-MacOSX10.4.11i386-Xcode (dashmacmini2.kitware.com)
Expected stderr to match:
expect-err> ^$
Actual stderr:
actual-err> Hit xcodebuild bug : /bin/sh: /Users/kitware/Dashboards/My Tests-MacOSX10.4.11i386-Xcode/CMakeMaster-build/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand-build/AddCustomCommand.build/Debug/ZERO_CHECK.build/Script-71CF34B67E0B4D0AAAA1463A.sh: /bin/sh: bad interpreter: Text file busy
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 5f66da0..9e2fe7a 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -101,7 +101,7 @@ function(run_cmake test)
endif()
foreach(o out err)
string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}")
- string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*is a member of multiple groups|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+ string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|Hit xcodebuild bug|[^\n]*is a member of multiple groups|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}")
set(expect_${o} "")
if(DEFINED expect_std${o})
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/RunCMake.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list