diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2010-02-04 16:24:57 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2010-02-04 16:24:57 (GMT) |
| commit | a0cc49a9157a2dd097ada0723a30abad39ad0d45 (patch) | |
| tree | 4c089e41d7e1e02200fea66c07f57cbac9053df1 | |
| parent | 9ef2491328924532be89bf1889f46b1052bc30d7 (diff) | |
| download | CMake-a0cc49a9157a2dd097ada0723a30abad39ad0d45.zip CMake-a0cc49a9157a2dd097ada0723a30abad39ad0d45.tar.gz CMake-a0cc49a9157a2dd097ada0723a30abad39ad0d45.tar.bz2 | |
Support for relative paths to executables in MemCheck tests. Also fixed a bug causing memcheck args to be overwritten repetitively.
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 24d1d9f..3e9156c 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -442,6 +442,8 @@ void cmCTestRunTest::ComputeArguments() cmCTestMemCheckHandler * handler = static_cast<cmCTestMemCheckHandler*> (this->TestHandler); this->ActualCommand = handler->MemoryTester.c_str(); + this->TestProperties->Args[1] = this->TestHandler->FindTheExecutable( + this->TestProperties->Args[1].c_str()); } else { @@ -459,7 +461,7 @@ void cmCTestRunTest::ComputeArguments() i != this->Arguments.end(); ++i) { this->TestCommand += " "; - this->TestCommand += cmSystemTools::EscapeSpaces(j->c_str()); + this->TestCommand += cmSystemTools::EscapeSpaces(i->c_str()); } for(;j != this->TestProperties->Args.end(); ++j) |