[Cmake-commits] CMake branch, next, updated. v2.8.9-918-g7204509

[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  7204509dfd3e7f87721a877bfce9ac53b2ccb700 (commit)
       via  af9df5b254595512c2765fc02b770d934be21f7f (commit)
      from  bce99957b3eaf082611d72b1510a8bf66abf003e (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=7204509dfd3e7f87721a877bfce9ac53b2ccb700
commit 7204509dfd3e7f87721a877bfce9ac53b2ccb700
Merge: bce9995 af9df5b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 17:23:12 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 30 17:23:12 2012 -0400

    Merge topic 'test-ctest-memcheck' into next
    
    af9df5b CTest: fix pre and post test commands with spaces


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af9df5b254595512c2765fc02b770d934be21f7f
commit af9df5b254595512c2765fc02b770d934be21f7f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 22:58:56 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Sep 30 23:22:34 2012 +0200

    CTest: fix pre and post test commands with spaces
    
    If the pre or post memcheck or test commands have spaces in the path these
    were never escaped, leading to broken commands. This was not covered in the
    test suite so it went unnoticed.

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index ead449e..b796b83 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1304,9 +1304,10 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
   for ( it = vec.begin(); it != vec.end(); ++it )
     {
     int retVal = 0;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
+    std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str());
+    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd
       << std::endl);
-    if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0,
+    if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0,
                                           cmSystemTools::OUTPUT_MERGE
         /*this->Verbose*/) || retVal != 0 )
       {

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

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


hooks/post-receive
-- 
CMake