This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via f207a13efca9d5ecf8c188651291ff5aa18f77e7 (commit) via 58cc3c22ef4a011196b0305bfee861dadd243414 (commit) via ba36363121f2004c196e785d5b67883a09160ec0 (commit) from 0d85199e454b4b20bc6462e9c4bbb5bff9a8f037 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f207a13efca9d5ecf8c188651291ff5aa18f77e7 commit f207a13efca9d5ecf8c188651291ff5aa18f77e7 Merge: 0d85199 58cc3c2 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Fri Jun 13 14:45:31 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jun 13 14:45:31 2014 -0400 Merge topic 'fix-valgrind-in-path' into next 58cc3c22 Fix ctest to allow valgrind to show up in the path name of a memcheck tool. ba363631 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58cc3c22ef4a011196b0305bfee861dadd243414 commit 58cc3c22ef4a011196b0305bfee861dadd243414 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Fri Jun 13 14:42:43 2014 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Fri Jun 13 14:42:43 2014 -0400 Fix ctest to allow valgrind to show up in the path name of a memcheck tool. For testing purposes CMake creates dummy memory checkers. The dummy checkers are in the CMake build tree. Before this change when the path contained the string valgrind, such as CMake-valgrind, all the checkers were thought to be valgrind, and this caused tests to fail. 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; } ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/CTest/cmCTestMemCheckHandler.cxx | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits