[Cmake-commits] CMake branch, next, updated. v2.8.1-1395-g4cfc78d

[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  4cfc78d0d862bc55a3cb95ba416937aff3170895 (commit)
       via  199e7f2f331aded0c7cb3f666bd2c996e2b4aa5e (commit)
       via  8d29fa46abba732410147aa80cbcc58ceb265835 (commit)
       via  a7abcd1442828792fc39397ced96a28cda95b032 (commit)
      from  046b331acd71e0c9e7c99d0eb3d7b4387a98b175 (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=4cfc78d0d862bc55a3cb95ba416937aff3170895
commit 4cfc78d0d862bc55a3cb95ba416937aff3170895
Merge: 046b331 199e7f2
Author: David Cole <david.cole at kitware.com>
Date:   Sun Jun 13 11:11:43 2010 -0400

    Merge branch 'remove-CTestTest3' into next
    
    Conflicts:
    	Tests/CMakeLists.txt

diff --cc Tests/CMakeLists.txt
index 9aa1c7b,0aaa7fb..32f68ee
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@@ -1470,24 -1470,6 +1470,17 @@@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION
        --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
        )
  
-     CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest3/test.cmake.in"
-       "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" @ONLY ESCAPE_QUOTES)
-     ADD_TEST(CTestTest3 ${CMAKE_CTEST_COMMAND}
-       -S "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" -V
-       --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log"
-       )
- 
 +    CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTestChecksum/test.cmake.in"
 +      "${CMake_BINARY_DIR}/Tests/CTestTestChecksum/test.cmake" @ONLY
 +      ESCAPE_QUOTES)
 +    ADD_TEST(CTestTestChecksum ${CMAKE_CTEST_COMMAND}
 +      -S "${CMake_BINARY_DIR}/Tests/CTestTestChecksum/test.cmake" -V
 +      --output-log
 +      "${CMake_BINARY_DIR}/Tests/CTestTestChecksum/testOutput.log"
 +      )
 +    SET_TESTS_PROPERTIES(CTestTestChecksum PROPERTIES PASS_REGULAR_EXPRESSION
 +      "Submission failed: Checksum failed for file")
 +
      # these tests take a long time, make sure they have it
      # if timeouts have not already been set
      GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=199e7f2f331aded0c7cb3f666bd2c996e2b4aa5e
commit 199e7f2f331aded0c7cb3f666bd2c996e2b4aa5e
Author: David Cole <david.cole at kitware.com>
Date:   Sun Jun 13 11:02:27 2010 -0400

    Remove CTestTest3.
    
    At this point, CTestTest3 causes more problems than it's worth.
    It uses CVS to grab a remote (over the network) copy of kwsys
    code for testing. This causes some sort of problem nearly every
    night on the nightly CMake dashboards. Worse: it causes problems
    on different machines on different nights, then the next day, it's
    fine again. So: remove this test and monitor the coverage.
    
    If we lose a significant portion of code coverage, I will revert
    this commit and re-activate the test. However, if we do not lose
    a significant portion of code coverage, I will remove the code
    for the test as well as removing it from the CMakeLists.txt file.
    
    Brad King and I discussed this over the last few weeks, and we both
    think we have sufficient coverage of all the checkout and update code
    in other locally (non-network) based tests.
    
    On the other hand, even if we do take a mild hit on coverage temporarily,
    it should be relatively easy to increase our coverage again by adding
    bits to those other locally based tests.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1b8f4f3..0aaa7fb 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1470,13 +1470,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
       )
 
-    CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest3/test.cmake.in"
-      "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" @ONLY ESCAPE_QUOTES)
-    ADD_TEST(CTestTest3 ${CMAKE_CTEST_COMMAND}
-      -S "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" -V
-      --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log"
-      )
-
     # these tests take a long time, make sure they have it
     # if timeouts have not already been set
     GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
@@ -1490,12 +1483,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       SET_TESTS_PROPERTIES ( CTestTest2
         PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
-
-    GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT)
-    IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
-      SET_TESTS_PROPERTIES ( CTestTest3
-        PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
-    ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
   ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS AND CMAKE_TESTS_CDASH_SERVER)
 
   IF(NOT DEFINED CTEST_RUN_CTestSubmitLargeOutput)

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

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


hooks/post-receive
-- 
CMake