[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4325-g8a5a07b

[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  8a5a07b0d82aeb95b6f5623b9528efeec11017ca (commit)
       via  02573eaedd2bb4027077b6915b9cebbcd8f46671 (commit)
       via  d10d111fba33de55ed1f6178b22c5dad200b9983 (commit)
      from  52369f40a223797f8682717de3210975d12c90ad (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=8a5a07b0d82aeb95b6f5623b9528efeec11017ca
commit 8a5a07b0d82aeb95b6f5623b9528efeec11017ca
Merge: 52369f4 02573ea
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Sep 25 10:52:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 25 10:52:46 2013 -0400

    Merge topic 'ctest_rerun_failed' into next
    
    02573ea Require WORKING_DIRECTORY for RerunFailed test
    d10d111 clean up dashboard


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02573eaedd2bb4027077b6915b9cebbcd8f46671
commit 02573eaedd2bb4027077b6915b9cebbcd8f46671
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Sep 25 10:50:24 2013 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Sep 25 10:50:24 2013 -0400

    Require WORKING_DIRECTORY for RerunFailed test
    
    The RerunFailed test won't behave properly if the test property
    WORKING_DIRECTORY is not honored.  Therefore, we now only run this
    test if we are building using CMake 2.8.4 or newer.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 75735dd..d1b1b43 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2139,12 +2139,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   set_tests_properties(CTestTestTimeout PROPERTIES
     PASS_REGULAR_EXPRESSION "TestTimeout *\\.+ *\\*\\*\\*Timeout.*CheckChild *\\.+ *Passed")
 
-  add_test(
-    NAME CTestTestRerunFailed
-    COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed)
-  set_tests_properties(CTestTestRerunFailed PROPERTIES
-    PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout
-    WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
+  # this test only runs correctly if WORKING_DIRECTORY is honored.
+  if (NOT CMAKE_VERSION VERSION_LESS "2.8.4")
+    add_test(
+      NAME CTestTestRerunFailed
+      COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed)
+    set_tests_properties(CTestTestRerunFailed PROPERTIES
+      PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout
+      WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
+  endif ()
 
   configure_file(
     "${CMake_SOURCE_DIR}/Tests/CTestTestZeroTimeout/test.cmake.in"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d10d111fba33de55ed1f6178b22c5dad200b9983
commit d10d111fba33de55ed1f6178b22c5dad200b9983
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Sep 25 10:37:49 2013 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Sep 25 10:37:49 2013 -0400

    clean up dashboard
    
    The Borland compiler does not seem to properly handle the substring
    signature of std::string::compare.  This commit contains a workaround
    for this problem.  This commit also changes the regular expression
    used to determine whether The RerunFailed test passes or fails.

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 1145b88..167d48e 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1776,7 +1776,10 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed()
   for (int i = 0; i < numFiles; ++i)
     {
     std::string fileName = directory.GetFile(i);
-    if (fileName.compare(0, pattern.length(), pattern) != 0)
+    // bcc crashes if we attempt a normal substring comparison,
+    // hence the following workaround
+    std::string fileNameSubstring = fileName.substr(0, pattern.length());
+    if (fileNameSubstring.compare(pattern) != 0)
       {
       continue;
       }
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 27b60a1..75735dd 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2143,7 +2143,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     NAME CTestTestRerunFailed
     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/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout
     WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
 
   configure_file(

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

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


hooks/post-receive
-- 
CMake