[Cmake-commits] CMake branch, next, updated. v2.8.2-240-g1b96e4c

[Brad King]

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  1b96e4c45c3b7e15c81cef9780153ef0a3ef0638 (commit)
       via  38c762c7283aef70080e3edd6bc03fd5b5032b9a (commit)
      from  f4b5f860c1911f9a410e3d4d8b303d07ae6c5037 (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=1b96e4c45c3b7e15c81cef9780153ef0a3ef0638
commit 1b96e4c45c3b7e15c81cef9780153ef0a3ef0638
Merge: f4b5f86 38c762c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 13 17:04:47 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 13 17:04:47 2010 -0400

    Merge topic 'resolve/ctest-file-checksum/remove-CTestTest3' into next
    
    38c762c Merge 'remove-CTestTest3' into ctest-file-checksum


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38c762c7283aef70080e3edd6bc03fd5b5032b9a
commit 38c762c7283aef70080e3edd6bc03fd5b5032b9a
Merge: 46df0b4 199e7f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 13 17:01:39 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 13 17:01:39 2010 -0400

    Merge 'remove-CTestTest3' into ctest-file-checksum
    
    Conflicts:
    	Tests/CMakeLists.txt

diff --cc Tests/CMakeLists.txt
index c1cc8b8,0aaa7fb..300b531
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@@ -1442,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)

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

Summary of changes:


hooks/post-receive
-- 
CMake