[Cmake-commits] [cmake-commits] king committed cmCTestMemCheckHandler.cxx 1.25.2.2 1.25.2.3 cmCTestMultiProcessHandler.cxx 1.25.2.6 1.25.2.7 cmCTestTestHandler.cxx 1.120.2.3 1.120.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Nov 11 13:34:17 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv11010/Source/CTest
Modified Files:
Tag: CMake-2-8
cmCTestMemCheckHandler.cxx cmCTestMultiProcessHandler.cxx
cmCTestTestHandler.cxx
Log Message:
CMake 2.8.0-rc7
Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.25.2.6
retrieving revision 1.25.2.7
diff -C 2 -d -r1.25.2.6 -r1.25.2.7
*** cmCTestMultiProcessHandler.cxx 10 Nov 2009 14:03:39 -0000 1.25.2.6
--- cmCTestMultiProcessHandler.cxx 11 Nov 2009 18:34:15 -0000 1.25.2.7
***************
*** 98,101 ****
--- 98,103 ----
{
this->Completed++;
+ this->TestFinishMap[test] = true;
+ this->TestRunningMap[test] = false;
this->RunningCount -= GetProcessorsUsed(test);
testRun->EndTest(this->Completed, this->Total, false);
Index: cmCTestMemCheckHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMemCheckHandler.cxx,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C 2 -d -r1.25.2.2 -r1.25.2.3
*** cmCTestMemCheckHandler.cxx 3 Nov 2009 22:25:03 -0000 1.25.2.2
--- cmCTestMemCheckHandler.cxx 11 Nov 2009 18:34:15 -0000 1.25.2.3
***************
*** 463,467 ****
{
this->MemoryTesterOptions = "-q --tool=memcheck --leak-check=yes "
! "--show-reachable=yes --workaround-gcc296-bugs=yes --num-callers=100";
}
if ( this->CTest->GetCTestConfiguration(
--- 463,467 ----
{
this->MemoryTesterOptions = "-q --tool=memcheck --leak-check=yes "
! "--show-reachable=yes --workaround-gcc296-bugs=yes --num-callers=50";
}
if ( this->CTest->GetCTestConfiguration(
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.120.2.3
retrieving revision 1.120.2.4
diff -C 2 -d -r1.120.2.3 -r1.120.2.4
*** cmCTestTestHandler.cxx 10 Nov 2009 14:03:39 -0000 1.120.2.3
--- cmCTestTestHandler.cxx 11 Nov 2009 18:34:15 -0000 1.120.2.4
***************
*** 83,97 ****
{
cmSystemTools::ChangeDirectory(cwd.c_str());
! std::string fname = cwd;
! fname += "/";
! fname += *it;
! //sanity check on relative path; if not, try absolute path
! if ( !cmSystemTools::FileIsDirectory(fname.c_str()))
{
fname = *it;
}
! if ( !cmSystemTools::FileExists(fname.c_str()) )
{
// No subdirectory? So what...
--- 83,100 ----
{
cmSystemTools::ChangeDirectory(cwd.c_str());
! std::string fname;
! if(cmSystemTools::FileIsFullPath(it->c_str()))
{
fname = *it;
}
+ else
+ {
+ fname = cwd;
+ fname += "/";
+ fname += *it;
+ }
! if ( !cmSystemTools::FileIsDirectory(fname.c_str()) )
{
// No subdirectory? So what...
More information about the Cmake-commits
mailing list