[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2971-gb11ed88

[Rolf Eike Beer]

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  b11ed88a3f11d0e6d1325f44a8bfdbf67e3b83a9 (commit)
       via  9969bfb77370f60053867b5afbe7b1076b7104b9 (commit)
       via  5dd8c01429da90a7417b72f17e784cc98f70f57c (commit)
      from  899125d4cdb9ba158cc1826027d1b1ec121d20fa (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=b11ed88a3f11d0e6d1325f44a8bfdbf67e3b83a9
commit b11ed88a3f11d0e6d1325f44a8bfdbf67e3b83a9
Merge: 899125d 9969bfb
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 15 03:08:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 15 03:08:05 2013 -0400

    Merge topic 'CTest-less-cd' into next
    
    9969bfb CTest: avoid useless changing of directory
    5dd8c01 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9969bfb77370f60053867b5afbe7b1076b7104b9
commit 9969bfb77370f60053867b5afbe7b1076b7104b9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 15 08:50:22 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed May 15 08:50:22 2013 +0200

    CTest: avoid useless changing of directory
    
    At this point we do not care what the current directory is, as nothing that
    requires a specific directory is done. Just make sure that at the end we are
    back in the same directory as at the start.

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index e7491bb..55fa396 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -82,7 +82,6 @@ bool cmCTestSubdirCommand
   std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
   for ( it = args.begin(); it != args.end(); ++ it )
     {
-    cmSystemTools::ChangeDirectory(cwd.c_str());
     std::string fname;
 
     if(cmSystemTools::FileIsFullPath(it->c_str()))
@@ -116,7 +115,6 @@ bool cmCTestSubdirCommand
     else
       {
       // No CTestTestfile? Who cares...
-      cmSystemTools::ChangeDirectory(cwd.c_str());
       continue;
       }
     fname += "/";
@@ -133,6 +131,7 @@ bool cmCTestSubdirCommand
       return false;
       }
     }
+  cmSystemTools::ChangeDirectory(cwd.c_str());
   return true;
 }
 

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

Summary of changes:
 Source/CMakeVersion.cmake           |    2 +-
 Source/CTest/cmCTestTestHandler.cxx |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake