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 972251f54c7c3aa652cff7262783ab2660b52a43 (commit)
via 6e996316db2b07f49fe806e19cb667b3f4dd4b16 (commit)
from f819cf535653a2ff9aad630ce4b767421627c42e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=972251f54c7c3aa652cff7262783ab2660b52a43
commit 972251f54c7c3aa652cff7262783ab2660b52a43
Merge: f819cf5 6e99631
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sat Feb 21 06:31:39 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Feb 21 06:31:39 2015 -0500
Merge topic 'ctest-output-options' into next
6e996316 fixup! Tests: Teach RunCMake to tolerate Guard Malloc lines in
test output
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e996316db2b07f49fe806e19cb667b3f4dd4b16
commit 6e996316db2b07f49fe806e19cb667b3f4dd4b16
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sat Feb 21 06:30:57 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Sat Feb 21 06:31:16 2015 -0500
fixup! Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
Add missing escape for backslashes in regex.
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index e47417e..abac66e 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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]*\n)+" "\\1" actual_std${o}
"${actual_std${o}}")
+ string(REGEX REPLACE
"(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat
returned)[^\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
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
