Support for relative paths to executables in MemCheck tests. Also fixed a bug causing memcheck args to be overwritten repetitively.

This commit is contained in:
Zach Mullen 2010-02-04 11:24:57 -05:00
parent 9ef2491328
commit a0cc49a915
1 changed files with 3 additions and 1 deletions

View File

@ -442,6 +442,8 @@ void cmCTestRunTest::ComputeArguments()
cmCTestMemCheckHandler * handler = static_cast<cmCTestMemCheckHandler*> cmCTestMemCheckHandler * handler = static_cast<cmCTestMemCheckHandler*>
(this->TestHandler); (this->TestHandler);
this->ActualCommand = handler->MemoryTester.c_str(); this->ActualCommand = handler->MemoryTester.c_str();
this->TestProperties->Args[1] = this->TestHandler->FindTheExecutable(
this->TestProperties->Args[1].c_str());
} }
else else
{ {
@ -459,7 +461,7 @@ void cmCTestRunTest::ComputeArguments()
i != this->Arguments.end(); ++i) i != this->Arguments.end(); ++i)
{ {
this->TestCommand += " "; this->TestCommand += " ";
this->TestCommand += cmSystemTools::EscapeSpaces(j->c_str()); this->TestCommand += cmSystemTools::EscapeSpaces(i->c_str());
} }
for(;j != this->TestProperties->Args.end(); ++j) for(;j != this->TestProperties->Args.end(); ++j)