[Cmake-commits] [cmake-commits] king committed cmCTestMultiProcessHandler.cxx 1.25.2.5 1.25.2.6 cmCTestTestHandler.cxx 1.120.2.2 1.120.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Nov 10 09:03:41 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv8948/Source/CTest
Modified Files:
Tag: CMake-2-8
cmCTestMultiProcessHandler.cxx cmCTestTestHandler.cxx
Log Message:
CMake 2.8.0-rc6
Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.25.2.5
retrieving revision 1.25.2.6
diff -C 2 -d -r1.25.2.5 -r1.25.2.6
*** cmCTestMultiProcessHandler.cxx 3 Nov 2009 22:25:03 -0000 1.25.2.5
--- cmCTestMultiProcessHandler.cxx 10 Nov 2009 14:03:39 -0000 1.25.2.6
***************
*** 195,198 ****
--- 195,203 ----
test != tests.end(); ++test)
{
+ //in case this test has already been started due to dependency
+ if(this->TestRunningMap[*test] || this->TestFinishMap[*test])
+ {
+ continue;
+ }
size_t processors = GetProcessorsUsed(*test);
if(processors > numToStart)
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.120.2.2
retrieving revision 1.120.2.3
diff -C 2 -d -r1.120.2.2 -r1.120.2.3
*** cmCTestTestHandler.cxx 9 Oct 2009 20:11:27 -0000 1.120.2.2
--- cmCTestTestHandler.cxx 10 Nov 2009 14:03:39 -0000 1.120.2.3
***************
*** 87,90 ****
--- 87,96 ----
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()) )
{
More information about the Cmake-commits
mailing list