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

BUG: fix bug where converage was required to get valgrind output because of bad current directory

Browse Source
This commit is contained in:
Bill Hoffman 2006-10-05 17:53:09 -04:00
parent bdf8e186e5
commit 027b9cbe87
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -253,7 +253,8 @@ int cmCTestCoverageHandler::ProcessHandler()
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find any coverage files." cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find any coverage files."
<< 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());
return 0; return 0;
} }
@ -602,7 +603,7 @@ int cmCTestCoverageHandler::ProcessHandler()
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot open coverage summary file." << std::endl); "Cannot open coverage summary file." << std::endl);
cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return -1; return -1;
} }
@ -615,6 +616,7 @@ int cmCTestCoverageHandler::ProcessHandler()
int logFileCount = 0; int logFileCount = 0;
if ( !this->StartCoverageLogFile(covLogFile, logFileCount) ) if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
{ {
cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return -1; return -1;
} }
totalCoverageMap::iterator fileIterator; totalCoverageMap::iterator fileIterator;
@ -650,6 +652,7 @@ int cmCTestCoverageHandler::ProcessHandler()
logFileCount ++; logFileCount ++;
if ( !this->StartCoverageLogFile(covLogFile, logFileCount) ) if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
{ {
cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return -1; return -1;
} }
} }

5
Source/CTest/cmCTestTestHandler.cxx
View File

@ -446,12 +446,13 @@ int cmCTestTestHandler::ProcessHandler()
this->UseExcludeRegExp(); this->UseExcludeRegExp();
this->SetExcludeRegExp(val); this->SetExcludeRegExp(val);
} }
this->TestResults.clear(); this->TestResults.clear();
cmCTestLog(this->CTest, HANDLER_OUTPUT, cmCTestLog(this->CTest, HANDLER_OUTPUT,
(this->MemCheck ? "Memory check" : "Test") (this->MemCheck ? "Memory check" : "Test")
<< " project" << std::endl); << " project " << cmSystemTools::GetCurrentWorkingDirectory()
<< std::endl);
if ( ! this->PreProcessHandler() ) if ( ! this->PreProcessHandler() )
{ {
return -1; return -1;