[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4310-g9daafde

[Zack Galbreath]

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  9daafde700af8febd025814935fa7b0ab9c600f7 (commit)
       via  28d0c034f795e4dcadcdfdb8502aa19e5565f269 (commit)
      from  5cf00baaf0e6f2a5299da5c3fcead01f941d7dd3 (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=9daafde700af8febd025814935fa7b0ab9c600f7
commit 9daafde700af8febd025814935fa7b0ab9c600f7
Merge: 5cf00ba 28d0c03
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Sep 24 15:24:23 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 24 15:24:23 2013 -0400

    Merge topic 'ctest_rerun_failed' into next
    
    28d0c03 specify WORKING_DIRECTORY as a test property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28d0c034f795e4dcadcdfdb8502aa19e5565f269
commit 28d0c034f795e4dcadcdfdb8502aa19e5565f269
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Sep 24 15:22:05 2013 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Sep 24 15:22:05 2013 -0400

    specify WORKING_DIRECTORY as a test property
    
    Minor change to address a test failure reported by amber10.kitware.
    
    While looking into this issue, I noticed that WORKING_DIRECTORY
    was being passed onto ctest's command line.  To work around this
    issue, we now instead specify WORKING_DIRECTORY as a test property
    instead.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f2d23cb..27b60a1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2141,10 +2141,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
 
   add_test(
     NAME CTestTestRerunFailed
-    COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed
-    WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
+    COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed)
   set_tests_properties(CTestTestRerunFailed PROPERTIES
-    PASS_REGULAR_EXPRESSION "1 tests failed out of 1" DEPENDS CTestTestTimeout)
+    PASS_REGULAR_EXPRESSION "1 tests failed out of 1" DEPENDS CTestTestTimeout
+    WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
 
   configure_file(
     "${CMake_SOURCE_DIR}/Tests/CTestTestZeroTimeout/test.cmake.in"

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

Summary of changes:
 Tests/CMakeLists.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake