[Cmake-commits] CMake branch, next, updated. v2.8.2-1118-gb57c488

David Cole david.cole at kitware.com
Thu Oct 28 14:07:19 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  b57c4889b4561784f10a24065995614cb2f2c164 (commit)
       via  3f94c7cc395d3f20890a6c9a14aa2795a5a9ce87 (commit)
      from  c0fd19f1ec5a4a98581f53b6fc2edbe1f02165e8 (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=b57c4889b4561784f10a24065995614cb2f2c164
commit b57c4889b4561784f10a24065995614cb2f2c164
Merge: c0fd19f 3f94c7c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Oct 28 14:07:15 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 28 14:07:15 2010 -0400

    Merge topic 'fix_ctest_working_dir' into next
    
    3f94c7c When processing DartMeasurements use the tests working directory.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f94c7cc395d3f20890a6c9a14aa2795a5a9ce87
commit 3f94c7cc395d3f20890a6c9a14aa2795a5a9ce87
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Oct 19 16:15:32 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Oct 19 16:15:32 2010 -0400

    When processing DartMeasurements use the tests working directory.
    
    Restore CMake 2.6 behavoir where the dart processing apparently was run from within the tests directory instead of the root of the build tree. This addresses issue reported on the VTK Dashboard where the Testing/Temporary directory is defined as ../../../Testing/Temporary but the DartProcessing is run with respect to the root of the build tree. This causes the regression/difference images to not be located by ctest and thus not uploaded to the dashboard.

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


More information about the Cmake-commits mailing list