[cmake-commits] hoffman committed cmCTestCoverageHandler.cxx 1.31 1.32 cmCTestTestHandler.cxx 1.47 1.48

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv7697/Source/CTest

Modified Files:
	cmCTestCoverageHandler.cxx cmCTestTestHandler.cxx 
Log Message:
BUG: fix bug where converage was required to get valgrind output because of bad current directory


Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cmCTestCoverageHandler.cxx	29 Mar 2006 17:01:24 -0000	1.31
+++ cmCTestCoverageHandler.cxx	5 Oct 2006 21:53:09 -0000	1.32
@@ -253,7 +253,8 @@
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find any coverage files."
       << std::endl);
-    // No coverage files is a valid thing, so the exit code is 0
+    // No coverage files is a valid thing, so the exit code is 0 
+    cmSystemTools::ChangeDirectory(currentDirectory.c_str());
     return 0;
     }
 
@@ -602,7 +603,7 @@
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-
+    cmSystemTools::ChangeDirectory(currentDirectory.c_str());
     return -1;
     }
 
@@ -615,6 +616,7 @@
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
+    cmSystemTools::ChangeDirectory(currentDirectory.c_str());
     return -1;
     }
   totalCoverageMap::iterator fileIterator;
@@ -650,6 +652,7 @@
       logFileCount ++;
       if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
         {
+        cmSystemTools::ChangeDirectory(currentDirectory.c_str());
         return -1;
         }
       }

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- cmCTestTestHandler.cxx	26 Jul 2006 15:46:22 -0000	1.47
+++ cmCTestTestHandler.cxx	5 Oct 2006 21:53:09 -0000	1.48
@@ -446,12 +446,13 @@
     this->UseExcludeRegExp();
     this->SetExcludeRegExp(val);
     }
-
+  
   this->TestResults.clear();
 
   cmCTestLog(this->CTest, HANDLER_OUTPUT,
     (this->MemCheck ? "Memory check" : "Test")
-    << " project" << std::endl);
+             << " project " << cmSystemTools::GetCurrentWorkingDirectory()
+             << std::endl);
   if ( ! this->PreProcessHandler() )
     {
     return -1;