diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-10-12 20:31:54 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-10-12 20:31:54 (GMT) |
| commit | 61a4c12ce6d0e6ed7508d5072c1ff61781d83fab (patch) | |
| tree | c94d166e8794faa887f96dec9d82d423619b2d17 | |
| parent | d5f31292b251ed3c7fc3a130693f5eb0f269a3bd (diff) | |
| download | CMake-61a4c12ce6d0e6ed7508d5072c1ff61781d83fab.zip CMake-61a4c12ce6d0e6ed7508d5072c1ff61781d83fab.tar.gz CMake-61a4c12ce6d0e6ed7508d5072c1ff61781d83fab.tar.bz2 | |
BUG: Use BuildDirectory from the DartConfiguration information. Also, Make missing coverage information not make ctest fail
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 55a259e..cf648f5 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -251,7 +251,7 @@ int cmCTestCoverageHandler::ProcessHandler() if ( files.size() == 0 ) { - cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find any coverage files." + cmCTestLog(this->CTest, WARNING, " Cannot find any coverage files. Ignoring Coverage request." << std::endl); // No coverage files is a valid thing, so the exit code is 0 cmSystemTools::ChangeDirectory(currentDirectory.c_str()); diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 287db2d..d7fcaa5 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -568,6 +568,11 @@ bool cmCTest::UpdateCTestConfiguration() } fin.close(); } + if ( !this->GetCTestConfiguration("BuildDirectory").empty() ) + { + this->BinaryDir = this->GetCTestConfiguration("BuildDirectory"); + cmSystemTools::ChangeDirectory(this->BinaryDir.c_str()); + } this->TimeOut = atoi(this->GetCTestConfiguration("TimeOut").c_str()); if ( this->ProduceXML ) { |