diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-22 18:45:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-03-22 18:45:34 (GMT) |
| commit | bc19ba603250af9187cfaedcb971b16d70718651 (patch) | |
| tree | 7312ffc64ab7132e899e26d5dc537085586cd6b2 /Source | |
| parent | 3ae23330ee41199a9da81ebc18ad372316a9527a (diff) | |
| parent | fcf3208ac10942344d4e7302ca8351758ba26978 (diff) | |
| download | CMake-bc19ba603250af9187cfaedcb971b16d70718651.zip CMake-bc19ba603250af9187cfaedcb971b16d70718651.tar.gz CMake-bc19ba603250af9187cfaedcb971b16d70718651.tar.bz2 | |
Merge topic 'ctest-detect-maven-errors-and-warnings'
fcf3208 CTest: catch warning output of Apache Maven
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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 }; |