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  49a3e208e455d238d5b58082de467e2d330832af (commit)
       via  e4e09212c58995a6cfde7d101bc02fce0f7829be (commit)
      from  0744ca9d0694dc7fa930059c4d83852094541e2f (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=49a3e208e455d238d5b58082de467e2d330832af
commit 49a3e208e455d238d5b58082de467e2d330832af
Merge: 0744ca9 e4e0921
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 13:46:32 2013 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 3 13:46:32 2013 -0400

    Merge topic 'escape-regex-specials-in-path' into next
    
    e4e0921 Merge branch 'master' into escape-regex-specials-in-path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4e09212c58995a6cfde7d101bc02fce0f7829be
commit e4e09212c58995a6cfde7d101bc02fce0f7829be
Merge: c9b75dc a4d8c64
Author:     Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Jun 3 13:42:18 2013 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 3 13:43:52 2013 -0400

    Merge branch 'master' into escape-regex-specials-in-path
    
    Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining
    changes from both sides.

diff --cc Tests/CTestTestMemcheck/CMakeLists.txt
index b5f758b,60df75c..ff02883
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@@ -1,12 -1,13 +1,15 @@@
 +REGEX_ESCAPE_STRING(CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR 
"${CMAKE_CURRENT_BINARY_DIR}")
 +
  foreach (_retval 0 1)
-   file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.c" "int main(){return 
${_retval};}\n")
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/memtester.cxx.in" 
"${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.cxx" @ONLY)
  endforeach ()
  
+ include_directories(${CMake_SOURCE_DIR}/Source ${CMake_BINARY_DIR}/Source)
+ 
  # create binaries that we will use as a pseudo memory checker
- add_executable(pseudo_valgrind "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
+ add_executable(pseudo_valgrind "${CMAKE_CURRENT_BINARY_DIR}/ret0.cxx")
  set_target_properties(pseudo_valgrind PROPERTIES OUTPUT_NAME valgrind)
+ target_link_libraries(pseudo_valgrind CMakeLib)
  
  # Xcode 2.x forgets to create the output directory before linking
  # the individual architectures.
@@@ -42,17 -65,66 +67,66 @@@ function(gen_mc_test NAME CHECKER
          -D PSEUDO_VALGRIND=$<TARGET_FILE:pseudo_valgrind>
          -D ERROR_COMMAND=$<TARGET_FILE:memcheck_fail>
          )
- endforeach ()
+ endfunction(gen_mc_test)
+ 
+ function(gen_mcnl_test NAME CHECKER)
+     gen_mc_test_internal(${NAME} ${CHECKER}
+         -D PSEUDO_BC=$<TARGET_FILE:pseudonl_BC>
+         -D PSEUDO_PURIFY=$<TARGET_FILE:pseudonl_purify>
+         -D PSEUDO_VALGRIND=$<TARGET_FILE:pseudonl_valgrind>
+         )
+     set_tests_properties(CTestTestMemcheck${NAME}
+         PROPERTIES
 -        PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: 
${CMAKE_CURRENT_BINARY_DIR}/${NAME}/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake\n")
++        PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/${NAME}/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake\n")
+ endfunction(gen_mcnl_test)
+ 
+ unset(CTEST_EXTRA_CONFIG)
+ unset(CTEST_EXTRA_CODE)
+ unset(CMAKELISTS_EXTRA_CODE)
+ 
+ gen_mc_test(DummyPurify "\${PSEUDO_PURIFY}")
+ gen_mc_test(DummyValgrind "\${PSEUDO_VALGRIND}")
+ gen_mc_test(DummyBC "\${PSEUDO_BC}")
+ gen_mcnl_test(DummyPurifyNoLogfile "\${PSEUDO_PURIFY}")
+ gen_mcnl_test(DummyValgrindNoLogfile "\${PSEUDO_VALGRIND}")
+ gen_mcnl_test(DummyBCNoLogfile "\${PSEUDO_BC}")
+ 
+ set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_PRE_MEMCHECK 
\"\${CTEST_MEMORYCHECK_COMMAND}\")\nset(CTEST_CUSTOM_POST_MEMCHECK 
\"\${CTEST_MEMORYCHECK_COMMAND}\")")
+ gen_mc_test(DummyValgrindPrePost "\${PSEUDO_VALGRIND}")
+ 
+ set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_POST_MEMCHECK \"\${ERROR_COMMAND}\")")
+ gen_mc_test(DummyValgrindFailPost "\${PSEUDO_VALGRIND}")
+ 
+ set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_PRE_MEMCHECK \"\${ERROR_COMMAND}\")")
+ gen_mc_test(DummyValgrindFailPre "\${PSEUDO_VALGRIND}")
+ 
+ unset(CTEST_EXTRA_CODE)
+ set(CTEST_EXTRA_CONFIG "set(CTEST_CUSTOM_MEMCHECK_IGNORE RunCMakeAgain)\n")
+ set(CMAKELISTS_EXTRA_CODE "add_test(NAME RunCMakeAgain COMMAND 
\"\${CMAKE_COMMAND}\" --version)")
+ gen_mc_test(DummyValgrindIgnoreMemcheck "\${PSEUDO_VALGRIND}")
+ 
+ set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE 
\"\${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\")")
+ unset(CMAKELISTS_EXTRA_CODE)
+ gen_mc_test(DummyValgrindInvalidSupFile "\${PSEUDO_VALGRIND}")
+ 
+ # CTest will add the logfile option as last option. Tell the dummy memcheck
+ # to ignore that argument. This will cause the logfile to be missing, which
+ # will be the prove for us that the custom option is indeed used.
+ set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"--\")")
+ gen_mc_test(DummyValgrindCustomOptions "\${PSEUDO_VALGRIND}")
+ 
+ unset(CTEST_EXTRA_CONFIG)
+ gen_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe")
+ 
+ gen_mc_test(Unknown "${CMAKE_COMMAND}")
  
  string(REPLACE "\\" "\\\\" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND}")
  string(REPLACE "(" "\\(" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND_ESCAPED}")
  string(REPLACE ")" "\\)" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND_ESCAPED}")
  string(REPLACE "+" "\\+" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND_ESCAPED}")
  
- foreach (_unkn Unknown UnknownQuoted)
-     set_tests_properties(CTestTestMemcheck${_unkn} PROPERTIES
-         PASS_REGULAR_EXPRESSION "Do not understand memory checker: 
${CMAKE_COMMAND_ESCAPED}\n(.*\n)?Error in read script: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/${_unkn}/test.cmake\n")
- endforeach ()
+ set_tests_properties(CTestTestMemcheckUnknown PROPERTIES
 -    PASS_REGULAR_EXPRESSION "Do not understand memory checker: 
${CMAKE_COMMAND_ESCAPED}\n(.*\n)?Error in read script: 
${CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n")
++    PASS_REGULAR_EXPRESSION "Do not understand memory checker: 
${CMAKE_COMMAND_ESCAPED}\n(.*\n)?Error in read script: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n")
  
  set_tests_properties(CTestTestMemcheckNotExist PROPERTIES
      PASS_REGULAR_EXPRESSION "Memory checker \\(MemoryCheckCommand\\) not set, 
or cannot find the specified program.")
@@@ -74,10 -146,13 +148,13 @@@ endforeach (
  
  set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
      PROPERTIES
-     PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*\n1/1 MemCheck 
#1: RunCMake .*${NORMAL_CTEST_OUTPUT}")
- 
- set_tests_properties(CTestTestMemcheckDummyPurify PROPERTIES
-     PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyPurify/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyPurify/test.cmake\n")
+     PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain 
.*${NORMAL_CTEST_OUTPUT}${BULLSEYE_MSG}$")
  
  set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
-     PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyBC/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 parsing XML in stream at line 1: no element found\n(.*\n)?Error in read 
script: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyBC/test.cmake\n")
+     PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+   Passed 
+[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error 
parsing XML in stream at line 1: no element found\n")
+ 
+ set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
 -    PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: 
${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
++    PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
+ 
+ set_tests_properties(CTestTestMemcheckDummyValgrindCustomOptions PROPERTIES
 -    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: 
${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: 
${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/test.cmake\n")
++    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: 
${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/test.cmake\n")

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

Summary of changes:


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

Reply via email to