[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestMultiProcessHandler.cxx 1.29 1.30
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Oct 20 10:54:07 EDT 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv16471
Modified Files:
cmCTestMultiProcessHandler.cxx
Log Message:
Ctest was broken for subdirs. Restored working directory state for tests so that their executables could be found.
Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** cmCTestMultiProcessHandler.cxx 5 Oct 2009 14:20:47 -0000 1.29
--- cmCTestMultiProcessHandler.cxx 20 Oct 2009 14:54:02 -0000 1.30
***************
*** 82,85 ****
--- 82,89 ----
testRun->SetIndex(test);
testRun->SetTestProperties(this->Properties[test]);
+
+ std::string current_dir = cmSystemTools::GetCurrentWorkingDirectory();
+ cmSystemTools::ChangeDirectory(this->Properties[test]->Directory.c_str());
+
if(testRun->StartTest(this->Total))
{
***************
*** 93,96 ****
--- 97,101 ----
this->Failed->push_back(this->Properties[test]->Name);
}
+ cmSystemTools::ChangeDirectory(current_dir.c_str());
}
More information about the Cmake-commits
mailing list