[Cmake-commits] CMake branch, next, updated. v2.8.5-1823-g9b39de8

[David Cole]

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  9b39de82bc97dbdcce7769cc04dd440c0226d0d7 (commit)
       via  339a321e66e142edbb0c6228caf368f09b4a072f (commit)
       via  5b4528b1f45a2a7d1ef5effe9813b1a2d764ac60 (commit)
      from  07b267b63af01be1a12fd12cc7b5493cf2893da8 (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=9b39de82bc97dbdcce7769cc04dd440c0226d0d7
commit 9b39de82bc97dbdcce7769cc04dd440c0226d0d7
Merge: 07b267b 339a321
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 6 12:08:16 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 6 12:08:16 2011 -0400

    Merge topic 'fix-ctesttestcrash-test' into next
    
    339a321 Tests: Look for "Illegal" or "SegFault" in the output
    5b4528b KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=339a321e66e142edbb0c6228caf368f09b4a072f
commit 339a321e66e142edbb0c6228caf368f09b4a072f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 6 12:06:36 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 6 12:06:36 2011 -0400

    Tests: Look for "Illegal" or "SegFault" in the output
    
    One of the dashmacmini5 runs of this test results in an
    "Illegal exception" detected instead of a segfault. For
    the purposes of this test, we're going to say that either
    is a "crash."

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9f4e8a3..7f83a47 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1586,7 +1586,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       PASS_REGULAR_EXPRESSION "Failed")
   ELSE(CMAKE_TEST_GENERATOR MATCHES "Watcom WMake")
     SET_TESTS_PROPERTIES(CTestTestCrash PROPERTIES
-      PASS_REGULAR_EXPRESSION "SegFault")
+      PASS_REGULAR_EXPRESSION "(Illegal|SegFault)")
   ENDIF(CMAKE_TEST_GENERATOR MATCHES "Watcom WMake")
 
   CONFIGURE_FILE(

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 Tests/CMakeLists.txt              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake