Skip to content

Commit

Permalink
Revert "Instead of scraping logs for error messages use CMake launchers"
Browse files Browse the repository at this point in the history
  • Loading branch information
BetsyMcPhail authored Aug 28, 2018
1 parent 388c489 commit 3ddf880
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions CTestCustom.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
".*/third_party/.*"
)

string(ASCII 27 ESC)

# DEBUG may be colored yellow (CSI 33m) and WARNING may be colored magenta
# (CSI 35m).
list(APPEND CTEST_CUSTOM_ERROR_EXCEPTION
"^DEBUG: "
"^WARNING: "
":[0-9]+: Failure$"
"^${ESC}\\[(33mDEBUG|35mWARNING): ${ESC}\\[0m"
)

# ERROR may be colored red (CSI 31m) and bolded (CSI 1m).
list(APPEND CTEST_CUSTOM_ERROR_MATCH
"^ERROR: "
"^${ESC}\\[31m${ESC}\\[1mERROR: ${ESC}\\[0m"
)

# Ignore various Mac CROSSTOOL-related warnings.
list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"ranlib: file: .* has no symbols"
Expand All @@ -15,13 +32,10 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
)

# WARNING may be colored magenta (CSI 35m).
string(ASCII 27 ESC)
list(APPEND CTEST_CUSTOM_WARNING_MATCH
"^WARNING: "
"^${ESC}\\[35mWARNING: ${ESC}\\[0m"
)

set(CTEST_USE_LAUNCHERS ON)

set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 100)
set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 100)

0 comments on commit 3ddf880

Please sign in to comment.