diff options
| -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 ) { |