[Cmake-commits] CMake branch, next, updated. v2.8.2-1138-gc661741

[David Cole]

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  c661741aad274d6e10f227c61a73400a865815f9 (commit)
       via  f4f8e5ad336d85d3dfd05fca7b097a75ad709c00 (commit)
      from  a4fafa12fef5154423d36a9a99b6f829b054ae6c (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=c661741aad274d6e10f227c61a73400a865815f9
commit c661741aad274d6e10f227c61a73400a865815f9
Merge: a4fafa1 f4f8e5a
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 29 14:18:31 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 29 14:18:31 2010 -0400

    Merge topic 'revert_fix_ctest_working_dir' into next
    
    f4f8e5a Revert "Revert "When processing DartMeasurements ... working directory.""


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4f8e5ad336d85d3dfd05fca7b097a75ad709c00
commit f4f8e5ad336d85d3dfd05fca7b097a75ad709c00
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 29 14:17:01 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Oct 29 14:17:01 2010 -0400

    Revert "Revert "When processing DartMeasurements ... working directory.""
    
        This reverts commit 4f8d752972a312f2132e293a414b1caf0a980577.
    
    Bill and I have run the newly-failing test on dash8 today, and
    it fails with and without this change. So, Bill wants to keep it.
    So I'm reverting the revert I made earlier today... :-)

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 6570d0e..76ff23a 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -264,7 +264,17 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
     {
     *this->TestHandler->LogFile << "Test time = " << buf << std::endl;
     }
+
+  // Set the working directory to the tests directory
+  std::string oldpath = cmSystemTools::GetCurrentWorkingDirectory();
+  cmSystemTools::ChangeDirectory(this->TestProperties->Directory.c_str());
+
   this->DartProcessing();
+
+  // restore working directory
+  cmSystemTools::ChangeDirectory(oldpath.c_str());
+
+
   // if this is doing MemCheck then all the output needs to be put into
   // Output since that is what is parsed by cmCTestMemCheckHandler
   if(!this->TestHandler->MemCheck && started)

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake