diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-16 12:54:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-16 12:54:50 (GMT) |
| commit | 6b05e03de4353275d1e2e614150757397bd1f855 (patch) | |
| tree | 4f0b75d2cbacaf74bbed467755e93bee70928348 /Source/CTest | |
| parent | e2789429aaa18dd7aef4858fb2702bf66d50aa6e (diff) | |
| parent | 58cc3c22ef4a011196b0305bfee861dadd243414 (diff) | |
| download | CMake-6b05e03de4353275d1e2e614150757397bd1f855.zip CMake-6b05e03de4353275d1e2e614150757397bd1f855.tar.gz CMake-6b05e03de4353275d1e2e614150757397bd1f855.tar.bz2 | |
Merge topic 'fix-valgrind-in-path'
58cc3c22 Fix ctest to allow valgrind to show up in the path name of a memcheck tool.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index ecaa474..09d0ad8 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -423,17 +423,18 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() { this->MemoryTester = this->CTest->GetCTestConfiguration("MemoryCheckCommand").c_str(); - + std::string testerName = + cmSystemTools::GetFilenameName(this->MemoryTester); // determine the checker type - if ( this->MemoryTester.find("valgrind") != std::string::npos ) + if ( testerName.find("valgrind") != std::string::npos ) { this->MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND; } - else if ( this->MemoryTester.find("purify") != std::string::npos ) + else if ( testerName.find("purify") != std::string::npos ) { this->MemoryTesterStyle = cmCTestMemCheckHandler::PURIFY; } - else if ( this->MemoryTester.find("BC") != std::string::npos ) + else if ( testerName.find("BC") != std::string::npos ) { this->MemoryTesterStyle = cmCTestMemCheckHandler::BOUNDS_CHECKER; } |