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 02f43cb3a31fe8cc6841217bdc0bac75e365177c (commit)
via fcf3208ac10942344d4e7302ca8351758ba26978 (commit)
via 96453cea6ae9d41e83d8148539acc614e6316abd (commit)
from 42640daaee73049f1647cf9ba708352c993aa319 (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=02f43cb3a31fe8cc6841217bdc0bac75e365177c
commit 02f43cb3a31fe8cc6841217bdc0bac75e365177c
Merge: 42640da fcf3208
Author: David Cole <[email protected]>
AuthorDate: Fri Mar 18 09:16:52 2011 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Fri Mar 18 09:16:52 2011 -0400
Merge topic 'ctest-detect-maven-errors-and-warnings' into next
fcf3208 CTest: catch warning output of Apache Maven
96453ce KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcf3208ac10942344d4e7302ca8351758ba26978
commit fcf3208ac10942344d4e7302ca8351758ba26978
Author: Rolf Eike Beer <[email protected]>
AuthorDate: Fri Mar 18 09:38:34 2011 +0100
Commit: David Cole <[email protected]>
CommitDate: Fri Mar 18 09:08:33 2011 -0400
CTest: catch warning output of Apache Maven
Some samples of things that got unnoticed by our nightly builds:
$ JAVA_HOME= mvn
Warning: JAVA_HOME environment variable is not set.
...
$ mvn
[INFO] Scanning for projects...
[INFO]
------------------------------------------------------------------------
[ERROR] BUILD FAILURE
...
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 9678ac4..86bd85d 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -93,6 +93,7 @@ static const char* cmCTestErrorMatches[] = {
": No such file or directory",
": Invalid argument",
"^The project cannot be built\\.",
+ "^\\[ERROR\\]",
0
};
@@ -119,7 +120,7 @@ static const char* cmCTestWarningMatches[] = {
"^\"[^\"]+\", line [0-9]+: [Ww](arning|arnung)",
"([^:]+): warning[ \\t]*[0-9]+[ \\t]*:",
"^(Warning|Warnung) ([0-9]+):",
- "^(Warning|Warnung) ",
+ "^(Warning|Warnung)[ :]",
"WARNING: ",
"([^ :]+) : warning",
"([^:]+): warning",
@@ -131,6 +132,7 @@ static const char* cmCTestWarningMatches[] = {
"\".*\", line [0-9]+: remark\\([0-9]*\\):",
"cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*",
"^CMake Warning.*:",
+ "^\\[WARNING\\]",
0
};
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestBuildHandler.cxx | 4 +++-
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
