diff options
author | David Cole <david.cole@kitware.com> | 2009-10-15 11:38:51 (GMT) |
---|---|---|
committer | David Cole <david.cole@kitware.com> | 2009-10-15 11:38:51 (GMT) |
commit | 886ae02356c9bfacb340a4317b8f26ffea4db4e9 (patch) | |
tree | c6d605428cee75d33cadb97e5994618f832e775b | |
parent | b5f63c6b7d3ffc28eecb434f2f16b7453bf27d98 (diff) | |
download | CMake-886ae02356c9bfacb340a4317b8f26ffea4db4e9.zip CMake-886ae02356c9bfacb340a4317b8f26ffea4db4e9.tar.gz CMake-886ae02356c9bfacb340a4317b8f26ffea4db4e9.tar.bz2 |
Fix crash on Windows. Remove trailing white space from regex. These changes should correct all failures of the new FailedSubmit tests.
-rw-r--r-- | Source/cmCTest.cxx | 2 | ||||
-rw-r--r-- | Tests/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 8dace33..6d21ab5 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2369,7 +2369,7 @@ void cmCTest::EmptyCTestConfiguration() void cmCTest::SetCTestConfiguration(const char *name, const char* value) { cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "SetCTestConfiguration:" - << name << ":" << value << "\n"); + << name << ":" << (value ? value : "(null)") << "\n"); if ( !name ) { diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c06c994..a3fb41e 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1131,7 +1131,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel set(regex "(Problems when submitting via S*CP") set(regex "${regex}|Error message was: ") set(regex "${regex}(Couldn.t resolve host ") - set(regex "${regex}|couldn.t connect to host ") + set(regex "${regex}|couldn.t connect to host") set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)") set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest)") |