kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Use BuildDirectory from the DartConfiguration information. Also, Make missing coverage information not make ctest fail

This commit is contained in:
Andy Cedilnik 2006-10-12 16:31:54 -04:00
parent d5f31292b2
commit 61a4c12ce6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -251,7 +251,7 @@ int cmCTestCoverageHandler::ProcessHandler()
if ( files.size() == 0 ) 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); << std::endl);
// No coverage files is a valid thing, so the exit code is 0 // No coverage files is a valid thing, so the exit code is 0
cmSystemTools::ChangeDirectory(currentDirectory.c_str()); cmSystemTools::ChangeDirectory(currentDirectory.c_str());

5
Source/cmCTest.cxx
View File

@ -568,6 +568,11 @@ bool cmCTest::UpdateCTestConfiguration()
} }
fin.close(); 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()); this->TimeOut = atoi(this->GetCTestConfiguration("TimeOut").c_str());
if ( this->ProduceXML ) if ( this->ProduceXML )
{ {