[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3441-g50066da

[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  50066dacca0d3bbe6d346b15737f58c467f94eff (commit)
       via  c0756b6dd67b7f2e113dafde398cec597537068c (commit)
      from  109cb22d598c6c9b9e79a502f50c8506d64145ab (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=50066dacca0d3bbe6d346b15737f58c467f94eff
commit 50066dacca0d3bbe6d346b15737f58c467f94eff
Merge: 109cb22 c0756b6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 27 16:09:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 27 16:09:42 2013 -0400

    Merge topic 'memcheck_pre_post_args' into next
    
    c0756b6 Revert "CTest: fix pre and post test commands with spaces" (#13887)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0756b6dd67b7f2e113dafde398cec597537068c
commit c0756b6dd67b7f2e113dafde398cec597537068c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 27 21:40:25 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jul 27 22:05:47 2013 +0200

    Revert "CTest: fix pre and post test commands with spaces" (#13887)
    
    This reverts commit 6187876dea89618044e200808bcae75a18bd4043.
    
    It was actually possible before to have paths with spaces in them, the spaces
    just need to be quoted. This way spaces will work as argument separators.

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 0508448..7a3edb5 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1302,10 +1302,9 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
   for ( it = vec.begin(); it != vec.end(); ++it )
     {
     int retVal = 0;
-    std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str());
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd
+    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
       << std::endl);
-    if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0,
+    if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0,
                                           cmSystemTools::OUTPUT_MERGE
         /*this->Verbose*/) || retVal != 0 )
       {
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index ff02883..2db9282 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -91,7 +91,11 @@ gen_mcnl_test(DummyPurifyNoLogfile "\${PSEUDO_PURIFY}")
 gen_mcnl_test(DummyValgrindNoLogfile "\${PSEUDO_VALGRIND}")
 gen_mcnl_test(DummyBCNoLogfile "\${PSEUDO_BC}")
 
-set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_PRE_MEMCHECK \"\${CTEST_MEMORYCHECK_COMMAND}\")\nset(CTEST_CUSTOM_POST_MEMCHECK \"\${CTEST_MEMORYCHECK_COMMAND}\")")
+set(CTEST_EXTRA_CODE "string(REPLACE \" \" \"\\\\ \" PRE_POST_COMMAND \"\${CTEST_MEMORYCHECK_COMMAND}\")
+
+set(CTEST_CUSTOM_PRE_MEMCHECK \"\${PRE_POST_COMMAND} pre command\")
+set(CTEST_CUSTOM_POST_MEMCHECK \"\${PRE_POST_COMMAND} post command \")
+")
 gen_mc_test(DummyValgrindPrePost "\${PSEUDO_VALGRIND}")
 
 set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_POST_MEMCHECK \"\${ERROR_COMMAND}\")")

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

Summary of changes:
 Source/CTest/cmCTestTestHandler.cxx    |    5 ++---
 Tests/CTestTestMemcheck/CMakeLists.txt |    6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake