[Cmake-commits] CMake branch, next, updated. v2.8.2-1136-ga4fafa1

David Cole david.cole at kitware.com
Fri Oct 29 09:07:59 EDT 2010


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  a4fafa12fef5154423d36a9a99b6f829b054ae6c (commit)
       via  4f8d752972a312f2132e293a414b1caf0a980577 (commit)
       via  57eea54720a378712735b5ec6386cef745855325 (commit)
      from  63529b1c6d7eb82b662a8fe672585c7339d12930 (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=a4fafa12fef5154423d36a9a99b6f829b054ae6c
commit a4fafa12fef5154423d36a9a99b6f829b054ae6c
Merge: 63529b1 4f8d752
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 29 09:07:53 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 29 09:07:53 2010 -0400

    Merge topic 'revert_fix_ctest_working_dir' into next
    
    4f8d752 Revert "When processing DartMeasurements use the tests working directory."
    57eea54 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f8d752972a312f2132e293a414b1caf0a980577
commit 4f8d752972a312f2132e293a414b1caf0a980577
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 29 09:03:56 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Oct 29 09:03:56 2010 -0400

    Revert "When processing DartMeasurements use the tests working directory."
    
    This reverts commit 3f94c7cc395d3f20890a6c9a14aa2795a5a9ce87.

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 76ff23a..6570d0e 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -264,17 +264,7 @@ 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 ----------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 1 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list