From 76e7c22b3c37f382d6232ee95fe77e39e7aa269d Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 19 Feb 2015 11:21:55 -0500 Subject: Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit --- Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in | 2 +- Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in | 2 +- Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake | 14 +++++++------- Tests/RunCMake/CTestMemcheck/test.cmake.in | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in index d15d148..3b8edf4 100644 --- a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in +++ b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.9) -project(CTestTestMemcheck@SUBTEST_NAME@ NONE) +project(CTestTestMemcheck@CASE_NAME@ NONE) include(CTest) add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version) diff --git a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in index 19c76c2..6d4a718 100644 --- a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in +++ b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in @@ -1,4 +1,4 @@ -set (CTEST_PROJECT_NAME "CTestTestMemcheck@SUBTEST_NAME@") +set (CTEST_PROJECT_NAME "CTestTestMemcheck@CASE_NAME@") set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT") set (CTEST_DART_SERVER_VERSION "2") set(CTEST_DROP_METHOD "http") diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake index 6485de8..005745e 100644 --- a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake @@ -4,18 +4,18 @@ set(SITE test-site) set(BUILDNAME test-build) set(COVERAGE_COMMAND "") -function(run_mc_test SUBTEST_NAME CHECKER_COMMAND) +function(run_mc_test CASE_NAME CHECKER_COMMAND) configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in - ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake @ONLY) + ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY) configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in - ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CTestConfig.cmake @ONLY) + ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY) configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in - ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CMakeLists.txt @ONLY) - run_cmake_command(${SUBTEST_NAME} ${CMAKE_CTEST_COMMAND} + ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY) + run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND} -C Debug - -S ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake + -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake -V - --output-log ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}-build/testOutput.log + --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log ${ARGN} ) endfunction() diff --git a/Tests/RunCMake/CTestMemcheck/test.cmake.in b/Tests/RunCMake/CTestMemcheck/test.cmake.in index 622d709..f9c1ba9 100644 --- a/Tests/RunCMake/CTestMemcheck/test.cmake.in +++ b/Tests/RunCMake/CTestMemcheck/test.cmake.in @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.9) # Settings: set(CTEST_SITE "@SITE@") -set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@SUBTEST_NAME@") +set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@CASE_NAME@") -set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@") -set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@-build") +set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@") +set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build") set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") -- cgit v0.12 From 9b50388b0989fab1d77fbb3d48e648c86427d808 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 19 Feb 2015 11:07:34 -0500 Subject: Tests: Split RunCTest helper out of RunCMake.CTest(Submit|Memcheck) Provide the "run_ctest" macro for use in other tests that also want to cover running "ctest" scripts. --- Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake | 16 ++-------------- Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake | 18 +----------------- Tests/RunCMake/README.rst | 10 ++++++++++ Tests/RunCMake/RunCTest.cmake | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 Tests/RunCMake/RunCTest.cmake diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake index 005745e..b1793fa 100644 --- a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake @@ -1,23 +1,11 @@ -include(RunCMake) +include(RunCTest) set(SITE test-site) set(BUILDNAME test-build) set(COVERAGE_COMMAND "") function(run_mc_test CASE_NAME CHECKER_COMMAND) - configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in - ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY) - configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in - ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY) - configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in - ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY) - run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND} - -C Debug - -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake - -V - --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log - ${ARGN} - ) + run_ctest(${CASE_NAME} ${ARGN}) endfunction() unset(CTEST_EXTRA_CONFIG) diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake index 797365d..c004e97 100644 --- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake @@ -1,26 +1,10 @@ -include(RunCMake) +include(RunCTest) # Default case parameters. set(CASE_DROP_METHOD "http") set(CASE_DROP_SITE "-no-site-") set(CASE_CTEST_SUBMIT_ARGS "") -function(run_ctest CASE_NAME) - configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in - ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY) - configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in - ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY) - configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in - ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY) - run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND} - -C Debug - -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake - -V - --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log - ${ARGN} - ) -endfunction() - #----------------------------------------------------------------------------- # Test bad argument combinations. diff --git a/Tests/RunCMake/README.rst b/Tests/RunCMake/README.rst index e801a86..4aae4ae 100644 --- a/Tests/RunCMake/README.rst +++ b/Tests/RunCMake/README.rst @@ -22,6 +22,16 @@ but do not actually build anything. To add a test: to fully customize the test case command-line. + Alternatively, if the test is to cover running ``ctest -S`` then use:: + + include(RunCTest) + run_ctest(SubTest1) + ... + run_ctest(SubTestN) + + and create ``test.cmake.in``, ``CTestConfig.cmake.in``, and + ``CMakeLists.txt.in`` files to be configured for each case. + 4. Create file ``/CMakeLists.txt`` in the directory containing:: cmake_minimum_required(...) diff --git a/Tests/RunCMake/RunCTest.cmake b/Tests/RunCMake/RunCTest.cmake new file mode 100644 index 0000000..e94432b --- /dev/null +++ b/Tests/RunCMake/RunCTest.cmake @@ -0,0 +1,17 @@ +include(RunCMake) + +function(run_ctest CASE_NAME) + configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in + ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY) + configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in + ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY) + configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in + ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY) + run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND} + -C Debug + -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake + -V + --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log + ${ARGN} + ) +endfunction() -- cgit v0.12 From d7662141a771f105e64b56543d99ee43e7d00849 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 19 Feb 2015 11:33:32 -0500 Subject: Tests: Rename RunCMake.{CTestSubmit => ctest_submit} Follow the convention of naming tests after the command they test. --- Tests/RunCMake/CMakeLists.txt | 2 +- Tests/RunCMake/CTestSubmit/BadArg-result.txt | 1 - Tests/RunCMake/CTestSubmit/BadArg-stderr.txt | 2 - Tests/RunCMake/CTestSubmit/BadFILES-result.txt | 1 - Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt | 2 - Tests/RunCMake/CTestSubmit/BadPARTS-result.txt | 1 - Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt | 2 - .../CTestSubmit/CDashUploadFILES-result.txt | 1 - .../CTestSubmit/CDashUploadFILES-stderr.txt | 2 - .../RunCMake/CTestSubmit/CDashUploadFTP-result.txt | 1 - .../RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt | 1 - .../CTestSubmit/CDashUploadNone-result.txt | 1 - .../CTestSubmit/CDashUploadNone-stderr.txt | 1 - .../CTestSubmit/CDashUploadPARTS-result.txt | 1 - .../CTestSubmit/CDashUploadPARTS-stderr.txt | 2 - .../CTestSubmit/CDashUploadRETRY_COUNT-result.txt | 1 - .../CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt | 2 - .../CTestSubmit/CDashUploadRETRY_DELAY-result.txt | 1 - .../CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt | 2 - Tests/RunCMake/CTestSubmit/CMakeLists.txt.in | 4 -- Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in | 6 --- Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt | 1 - Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt | 4 -- Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt | 1 - Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt | 1 - Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt | 3 -- Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt | 3 -- .../RunCMake/CTestSubmit/FailDrop-http-result.txt | 1 - .../RunCMake/CTestSubmit/FailDrop-http-stderr.txt | 3 -- .../RunCMake/CTestSubmit/FailDrop-http-stdout.txt | 3 -- .../RunCMake/CTestSubmit/FailDrop-https-result.txt | 1 - .../RunCMake/CTestSubmit/FailDrop-https-stderr.txt | 3 -- .../RunCMake/CTestSubmit/FailDrop-https-stdout.txt | 3 -- Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt | 1 - Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt | 2 - Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt | 1 - .../CTestSubmit/FailDrop-xmlrpc-result.txt | 1 - .../CTestSubmit/FailDrop-xmlrpc-stderr.txt | 2 - .../CTestSubmit/FailDrop-xmlrpc-stdout.txt | 1 - .../CTestSubmit/PARTSCDashUpload-result.txt | 1 - .../CTestSubmit/PARTSCDashUpload-stderr.txt | 2 - .../CTestSubmit/PARTSCDashUploadType-result.txt | 1 - .../CTestSubmit/PARTSCDashUploadType-stderr.txt | 2 - .../CTestSubmit/RepeatRETURN_VALUE-result.txt | 1 - .../CTestSubmit/RepeatRETURN_VALUE-stderr.txt | 2 - Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake | 46 ---------------------- Tests/RunCMake/CTestSubmit/test.cmake.in | 16 -------- Tests/RunCMake/ctest_submit/BadArg-result.txt | 1 + Tests/RunCMake/ctest_submit/BadArg-stderr.txt | 2 + Tests/RunCMake/ctest_submit/BadFILES-result.txt | 1 + Tests/RunCMake/ctest_submit/BadFILES-stderr.txt | 2 + Tests/RunCMake/ctest_submit/BadPARTS-result.txt | 1 + Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt | 2 + .../ctest_submit/CDashUploadFILES-result.txt | 1 + .../ctest_submit/CDashUploadFILES-stderr.txt | 2 + .../ctest_submit/CDashUploadFTP-result.txt | 1 + .../ctest_submit/CDashUploadFTP-stderr.txt | 1 + .../ctest_submit/CDashUploadNone-result.txt | 1 + .../ctest_submit/CDashUploadNone-stderr.txt | 1 + .../ctest_submit/CDashUploadPARTS-result.txt | 1 + .../ctest_submit/CDashUploadPARTS-stderr.txt | 2 + .../ctest_submit/CDashUploadRETRY_COUNT-result.txt | 1 + .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt | 2 + .../ctest_submit/CDashUploadRETRY_DELAY-result.txt | 1 + .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt | 2 + Tests/RunCMake/ctest_submit/CMakeLists.txt.in | 4 ++ Tests/RunCMake/ctest_submit/CTestConfig.cmake.in | 6 +++ Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt | 1 + Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt | 4 ++ Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt | 1 + .../RunCMake/ctest_submit/FailDrop-ftp-result.txt | 1 + .../RunCMake/ctest_submit/FailDrop-ftp-stderr.txt | 3 ++ .../RunCMake/ctest_submit/FailDrop-ftp-stdout.txt | 3 ++ .../RunCMake/ctest_submit/FailDrop-http-result.txt | 1 + .../RunCMake/ctest_submit/FailDrop-http-stderr.txt | 3 ++ .../RunCMake/ctest_submit/FailDrop-http-stdout.txt | 3 ++ .../ctest_submit/FailDrop-https-result.txt | 1 + .../ctest_submit/FailDrop-https-stderr.txt | 3 ++ .../ctest_submit/FailDrop-https-stdout.txt | 3 ++ .../RunCMake/ctest_submit/FailDrop-scp-result.txt | 1 + .../RunCMake/ctest_submit/FailDrop-scp-stderr.txt | 2 + .../RunCMake/ctest_submit/FailDrop-scp-stdout.txt | 1 + .../ctest_submit/FailDrop-xmlrpc-result.txt | 1 + .../ctest_submit/FailDrop-xmlrpc-stderr.txt | 2 + .../ctest_submit/FailDrop-xmlrpc-stdout.txt | 1 + .../ctest_submit/PARTSCDashUpload-result.txt | 1 + .../ctest_submit/PARTSCDashUpload-stderr.txt | 2 + .../ctest_submit/PARTSCDashUploadType-result.txt | 1 + .../ctest_submit/PARTSCDashUploadType-stderr.txt | 2 + .../ctest_submit/RepeatRETURN_VALUE-result.txt | 1 + .../ctest_submit/RepeatRETURN_VALUE-stderr.txt | 2 + Tests/RunCMake/ctest_submit/RunCMakeTest.cmake | 46 ++++++++++++++++++++++ Tests/RunCMake/ctest_submit/test.cmake.in | 16 ++++++++ 93 files changed, 142 insertions(+), 142 deletions(-) delete mode 100644 Tests/RunCMake/CTestSubmit/BadArg-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/CMakeLists.txt.in delete mode 100644 Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt delete mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt delete mode 100644 Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake delete mode 100644 Tests/RunCMake/CTestSubmit/test.cmake.in create mode 100644 Tests/RunCMake/ctest_submit/BadArg-result.txt create mode 100644 Tests/RunCMake/ctest_submit/BadArg-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/BadFILES-result.txt create mode 100644 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/BadPARTS-result.txt create mode 100644 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/CMakeLists.txt.in create mode 100644 Tests/RunCMake/ctest_submit/CTestConfig.cmake.in create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-http-result.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-https-result.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt create mode 100644 Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt create mode 100644 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/ctest_submit/test.cmake.in diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 2de82a7..44e6ec4 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -64,7 +64,6 @@ add_RunCMake_test(CMP0053) add_RunCMake_test(CMP0054) add_RunCMake_test(CMP0055) add_RunCMake_test(CTest) -add_RunCMake_test(CTestSubmit) if(NOT CMake_TEST_EXTERNAL_CMAKE) add_RunCMake_test(CTestMemcheck @@ -130,6 +129,7 @@ add_RunCMake_test(build_command) add_RunCMake_test(export) add_RunCMake_test(cmake_minimum_required) add_RunCMake_test(continue) +add_RunCMake_test(ctest_submit) add_RunCMake_test(file) add_RunCMake_test(find_library) add_RunCMake_test(find_package) diff --git a/Tests/RunCMake/CTestSubmit/BadArg-result.txt b/Tests/RunCMake/CTestSubmit/BadArg-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/BadArg-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt b/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt deleted file mode 100644 index 68812ab..0000000 --- a/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/BadArg/test.cmake:[0-9]+ \(ctest_submit\): - ctest_submit called with unknown argument "bad-arg". diff --git a/Tests/RunCMake/CTestSubmit/BadFILES-result.txt b/Tests/RunCMake/CTestSubmit/BadFILES-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/BadFILES-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt b/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt deleted file mode 100644 index 703224b..0000000 --- a/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/BadFILES/test.cmake:[0-9]+ \(ctest_submit\): - File "bad-file" does not exist. Cannot submit a non-existent file. diff --git a/Tests/RunCMake/CTestSubmit/BadPARTS-result.txt b/Tests/RunCMake/CTestSubmit/BadPARTS-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/BadPARTS-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt b/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt deleted file mode 100644 index 4e491a9..0000000 --- a/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/BadPARTS/test.cmake:[0-9]+ \(ctest_submit\): - Part name "bad-part" is invalid. diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt b/Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt deleted file mode 100644 index 48177e2..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadFILES/test.cmake:[0-9]+ \(ctest_submit\): - ctest_submit called with unknown argument "FILES". diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt b/Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt deleted file mode 100644 index 77df44f..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -Only http and https are supported for CDASH_UPLOAD diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt b/Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt deleted file mode 100644 index af95b5c..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -Upload file not specified diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt b/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt deleted file mode 100644 index 497ead2..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadPARTS/test.cmake:[0-9]+ \(ctest_submit\): - ctest_submit called with unknown argument "PARTS". diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt deleted file mode 100644 index 8c4e6b1..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\): - ctest_submit called with unknown argument "RETRY_COUNT". diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt deleted file mode 100644 index 6c56399..0000000 --- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\): - ctest_submit called with unknown argument "RETRY_DELAY". diff --git a/Tests/RunCMake/CTestSubmit/CMakeLists.txt.in b/Tests/RunCMake/CTestSubmit/CMakeLists.txt.in deleted file mode 100644 index 96e6c13..0000000 --- a/Tests/RunCMake/CTestSubmit/CMakeLists.txt.in +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(CTestSubmit@CASE_NAME@ NONE) -include(CTest) -add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version) diff --git a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in b/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in deleted file mode 100644 index 378a85a..0000000 --- a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in +++ /dev/null @@ -1,6 +0,0 @@ -set(CTEST_PROJECT_NAME "CTestSubmit@CASE_NAME@") - -# Intentionally leave out other upload-related CTestConfig.cmake settings -# so that any ctest_submit calls fail with an error message. -set(CTEST_DROP_METHOD "@CASE_DROP_METHOD@") -set(CTEST_DROP_SITE "@CASE_DROP_SITE@") diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt deleted file mode 100644 index b451315..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -Missing arguments for submit via cp: -.* - Problems when submitting via CP -Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-cp/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt deleted file mode 100644 index fa6e004..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Submit files \(using cp\) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt deleted file mode 100644 index a622fac..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -Error message was: .* - Problems when submitting via FTP -Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-ftp/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt deleted file mode 100644 index 345bb62..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -Submit files \(using ftp\) - Using FTP submit method - Drop site: ftp:// diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt deleted file mode 100644 index 6870d2e..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -Error message was: .* - Problems when submitting via HTTP -Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-http/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt deleted file mode 100644 index c7f35c5..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -Submit files \(using http\) - Using HTTP submit method - Drop site:http:// diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt deleted file mode 100644 index a3c0cd5..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -Error message was: .* - Problems when submitting via HTTP -Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-https/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt deleted file mode 100644 index 19f8234..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -Submit files \(using https\) - Using HTTP submit method - Drop site:https:// diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt deleted file mode 100644 index 42b8f50..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ - Problems when submitting via SCP -Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-scp/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt deleted file mode 100644 index ec2ce92..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Submit files \(using scp\) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt deleted file mode 100644 index 020b615..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ - (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!) -Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt deleted file mode 100644 index ed2acb5..0000000 --- a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Submit files \(using xmlrpc\) diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt deleted file mode 100644 index dfa7e33..0000000 --- a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/PARTSCDashUpload/test.cmake:[0-9]+ \(ctest_submit\): - Part name "CDASH_UPLOAD" is invalid. diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt deleted file mode 100644 index 42becaf..0000000 --- a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType/test.cmake:[0-9]+ \(ctest_submit\): - Part name "CDASH_UPLOAD_TYPE" is invalid. diff --git a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt b/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt b/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt deleted file mode 100644 index d56793e..0000000 --- a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMake Error at .*/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE/test.cmake:[0-9]+ \(ctest_submit\): - Called with more than one value for RETURN_VALUE diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake deleted file mode 100644 index c004e97..0000000 --- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake +++ /dev/null @@ -1,46 +0,0 @@ -include(RunCTest) - -# Default case parameters. -set(CASE_DROP_METHOD "http") -set(CASE_DROP_SITE "-no-site-") -set(CASE_CTEST_SUBMIT_ARGS "") - -#----------------------------------------------------------------------------- -# Test bad argument combinations. - -function(run_ctest_submit CASE_NAME) - set(CASE_CTEST_SUBMIT_ARGS "${ARGN}") - run_ctest(${CASE_NAME}) -endfunction() - -run_ctest_submit(BadArg bad-arg) -run_ctest_submit(BadPARTS PARTS bad-part) -run_ctest_submit(BadFILES FILES bad-file) -run_ctest_submit(RepeatRETURN_VALUE RETURN_VALUE res RETURN_VALUE res) -run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD) -run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE) -run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS) -run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES) -run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT) -run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY) -run_ctest_submit(CDashUploadNone CDASH_UPLOAD) - -function(run_ctest_CDashUploadFTP) - set(CASE_DROP_METHOD ftp) - run_ctest_submit(CDashUploadFTP CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE}) -endfunction() -run_ctest_CDashUploadFTP() - -#----------------------------------------------------------------------------- -# Test failed drops by various protocols - -function(run_ctest_submit_FailDrop CASE_DROP_METHOD) - run_ctest(FailDrop-${CASE_DROP_METHOD}) -endfunction() - -run_ctest_submit_FailDrop(cp) -run_ctest_submit_FailDrop(ftp) -run_ctest_submit_FailDrop(http) -run_ctest_submit_FailDrop(https) -run_ctest_submit_FailDrop(scp) -run_ctest_submit_FailDrop(xmlrpc) diff --git a/Tests/RunCMake/CTestSubmit/test.cmake.in b/Tests/RunCMake/CTestSubmit/test.cmake.in deleted file mode 100644 index ba826f1..0000000 --- a/Tests/RunCMake/CTestSubmit/test.cmake.in +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.1) - -set(CTEST_SITE "test-site") -set(CTEST_BUILD_NAME "test-build-name") -set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@") -set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build") -set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") -set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") -set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") -set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") - -ctest_start(Experimental) -ctest_configure() - -set(ctest_submit_args "@CASE_CTEST_SUBMIT_ARGS@") -ctest_submit(${ctest_submit_args}) diff --git a/Tests/RunCMake/ctest_submit/BadArg-result.txt b/Tests/RunCMake/ctest_submit/BadArg-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/BadArg-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/BadArg-stderr.txt b/Tests/RunCMake/ctest_submit/BadArg-stderr.txt new file mode 100644 index 0000000..7eeef0a --- /dev/null +++ b/Tests/RunCMake/ctest_submit/BadArg-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/BadArg/test.cmake:[0-9]+ \(ctest_submit\): + ctest_submit called with unknown argument "bad-arg". diff --git a/Tests/RunCMake/ctest_submit/BadFILES-result.txt b/Tests/RunCMake/ctest_submit/BadFILES-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/BadFILES-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt b/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt new file mode 100644 index 0000000..ab84ab9 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/BadFILES/test.cmake:[0-9]+ \(ctest_submit\): + File "bad-file" does not exist. Cannot submit a non-existent file. diff --git a/Tests/RunCMake/ctest_submit/BadPARTS-result.txt b/Tests/RunCMake/ctest_submit/BadPARTS-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/BadPARTS-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt b/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt new file mode 100644 index 0000000..3db54f3 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/BadPARTS/test.cmake:[0-9]+ \(ctest_submit\): + Part name "bad-part" is invalid. diff --git a/Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt new file mode 100644 index 0000000..0106fee --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadFILES/test.cmake:[0-9]+ \(ctest_submit\): + ctest_submit called with unknown argument "FILES". diff --git a/Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt new file mode 100644 index 0000000..77df44f --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt @@ -0,0 +1 @@ +Only http and https are supported for CDASH_UPLOAD diff --git a/Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt new file mode 100644 index 0000000..af95b5c --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt @@ -0,0 +1 @@ +Upload file not specified diff --git a/Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt new file mode 100644 index 0000000..fe94cb7 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadPARTS/test.cmake:[0-9]+ \(ctest_submit\): + ctest_submit called with unknown argument "PARTS". diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt new file mode 100644 index 0000000..21621d4 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\): + ctest_submit called with unknown argument "RETRY_COUNT". diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt new file mode 100644 index 0000000..f726674 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\): + ctest_submit called with unknown argument "RETRY_DELAY". diff --git a/Tests/RunCMake/ctest_submit/CMakeLists.txt.in b/Tests/RunCMake/ctest_submit/CMakeLists.txt.in new file mode 100644 index 0000000..96e6c13 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CMakeLists.txt.in @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.1) +project(CTestSubmit@CASE_NAME@ NONE) +include(CTest) +add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version) diff --git a/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in b/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in new file mode 100644 index 0000000..378a85a --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in @@ -0,0 +1,6 @@ +set(CTEST_PROJECT_NAME "CTestSubmit@CASE_NAME@") + +# Intentionally leave out other upload-related CTestConfig.cmake settings +# so that any ctest_submit calls fail with an error message. +set(CTEST_DROP_METHOD "@CASE_DROP_METHOD@") +set(CTEST_DROP_SITE "@CASE_DROP_SITE@") diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt new file mode 100644 index 0000000..c3c084d --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt @@ -0,0 +1,4 @@ +Missing arguments for submit via cp: +.* + Problems when submitting via CP +Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-cp/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt new file mode 100644 index 0000000..fa6e004 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt @@ -0,0 +1 @@ +Submit files \(using cp\) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt new file mode 100644 index 0000000..73df5c1 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt @@ -0,0 +1,3 @@ +Error message was: .* + Problems when submitting via FTP +Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt new file mode 100644 index 0000000..345bb62 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt @@ -0,0 +1,3 @@ +Submit files \(using ftp\) + Using FTP submit method + Drop site: ftp:// diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-http-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt new file mode 100644 index 0000000..c1a9126 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt @@ -0,0 +1,3 @@ +Error message was: .* + Problems when submitting via HTTP +Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt new file mode 100644 index 0000000..c7f35c5 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt @@ -0,0 +1,3 @@ +Submit files \(using http\) + Using HTTP submit method + Drop site:http:// diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-https-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt new file mode 100644 index 0000000..11db01a --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt @@ -0,0 +1,3 @@ +Error message was: .* + Problems when submitting via HTTP +Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt new file mode 100644 index 0000000..19f8234 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt @@ -0,0 +1,3 @@ +Submit files \(using https\) + Using HTTP submit method + Drop site:https:// diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt new file mode 100644 index 0000000..0790297 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt @@ -0,0 +1,2 @@ + Problems when submitting via SCP +Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt new file mode 100644 index 0000000..ec2ce92 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt @@ -0,0 +1 @@ +Submit files \(using scp\) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt new file mode 100644 index 0000000..23ea92c --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt @@ -0,0 +1,2 @@ + (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!) +Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt new file mode 100644 index 0000000..ed2acb5 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt @@ -0,0 +1 @@ +Submit files \(using xmlrpc\) diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt new file mode 100644 index 0000000..ad4c8cb --- /dev/null +++ b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/PARTSCDashUpload/test.cmake:[0-9]+ \(ctest_submit\): + Part name "CDASH_UPLOAD" is invalid. diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt new file mode 100644 index 0000000..8d8a852 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/PARTSCDashUploadType/test.cmake:[0-9]+ \(ctest_submit\): + Part name "CDASH_UPLOAD_TYPE" is invalid. diff --git a/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt new file mode 100644 index 0000000..6e17c75 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt @@ -0,0 +1,2 @@ +CMake Error at .*/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE/test.cmake:[0-9]+ \(ctest_submit\): + Called with more than one value for RETURN_VALUE diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake new file mode 100644 index 0000000..c004e97 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake @@ -0,0 +1,46 @@ +include(RunCTest) + +# Default case parameters. +set(CASE_DROP_METHOD "http") +set(CASE_DROP_SITE "-no-site-") +set(CASE_CTEST_SUBMIT_ARGS "") + +#----------------------------------------------------------------------------- +# Test bad argument combinations. + +function(run_ctest_submit CASE_NAME) + set(CASE_CTEST_SUBMIT_ARGS "${ARGN}") + run_ctest(${CASE_NAME}) +endfunction() + +run_ctest_submit(BadArg bad-arg) +run_ctest_submit(BadPARTS PARTS bad-part) +run_ctest_submit(BadFILES FILES bad-file) +run_ctest_submit(RepeatRETURN_VALUE RETURN_VALUE res RETURN_VALUE res) +run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD) +run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE) +run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS) +run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES) +run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT) +run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY) +run_ctest_submit(CDashUploadNone CDASH_UPLOAD) + +function(run_ctest_CDashUploadFTP) + set(CASE_DROP_METHOD ftp) + run_ctest_submit(CDashUploadFTP CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE}) +endfunction() +run_ctest_CDashUploadFTP() + +#----------------------------------------------------------------------------- +# Test failed drops by various protocols + +function(run_ctest_submit_FailDrop CASE_DROP_METHOD) + run_ctest(FailDrop-${CASE_DROP_METHOD}) +endfunction() + +run_ctest_submit_FailDrop(cp) +run_ctest_submit_FailDrop(ftp) +run_ctest_submit_FailDrop(http) +run_ctest_submit_FailDrop(https) +run_ctest_submit_FailDrop(scp) +run_ctest_submit_FailDrop(xmlrpc) diff --git a/Tests/RunCMake/ctest_submit/test.cmake.in b/Tests/RunCMake/ctest_submit/test.cmake.in new file mode 100644 index 0000000..ba826f1 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/test.cmake.in @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.1) + +set(CTEST_SITE "test-site") +set(CTEST_BUILD_NAME "test-build-name") +set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@") +set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build") +set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") +set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") +set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") +set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") + +ctest_start(Experimental) +ctest_configure() + +set(ctest_submit_args "@CASE_CTEST_SUBMIT_ARGS@") +ctest_submit(${ctest_submit_args}) -- cgit v0.12 From 1d82105e29fc6f0bb71a474f876a7553b397cc26 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 19 Feb 2015 11:35:51 -0500 Subject: Tests: Rename RunCMake.{CTestMemcheck => ctest_memcheck} Follow the convention of naming tests after the command they test. --- Tests/RunCMake/CMakeLists.txt | 2 +- Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in | 7 -- Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in | 9 -- .../CTestMemcheck/DummyAddressSanitizer-result.txt | 1 - .../CTestMemcheck/DummyAddressSanitizer-stderr.txt | 2 - .../CTestMemcheck/DummyAddressSanitizer-stdout.txt | 2 - Tests/RunCMake/CTestMemcheck/DummyBC-result.txt | 1 - Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt | 1 - Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt | 3 - .../CTestMemcheck/DummyBCNoLogFile-result.txt | 1 - .../CTestMemcheck/DummyBCNoLogFile-stderr.txt | 3 - .../CTestMemcheck/DummyBCNoLogFile-stdout.txt | 3 - .../CTestMemcheck/DummyLeakSanitizer-result.txt | 1 - .../CTestMemcheck/DummyLeakSanitizer-stderr.txt | 2 - .../CTestMemcheck/DummyLeakSanitizer-stdout.txt | 3 - .../CTestMemcheck/DummyMemorySanitizer-result.txt | 1 - .../CTestMemcheck/DummyMemorySanitizer-stderr.txt | 2 - .../CTestMemcheck/DummyMemorySanitizer-stdout.txt | 2 - .../RunCMake/CTestMemcheck/DummyPurify-result.txt | 1 - .../RunCMake/CTestMemcheck/DummyPurify-stderr.txt | 3 - .../RunCMake/CTestMemcheck/DummyPurify-stdout.txt | 6 - .../CTestMemcheck/DummyPurifyNoLogFile-result.txt | 1 - .../CTestMemcheck/DummyPurifyNoLogFile-stderr.txt | 2 - .../CTestMemcheck/DummyPurifyNoLogFile-stdout.txt | 3 - .../CTestMemcheck/DummyThreadSanitizer-result.txt | 1 - .../CTestMemcheck/DummyThreadSanitizer-stderr.txt | 2 - .../CTestMemcheck/DummyThreadSanitizer-stdout.txt | 13 -- .../DummyUndefinedBehaviorSanitizer-result.txt | 1 - .../DummyUndefinedBehaviorSanitizer-stderr.txt | 2 - .../DummyUndefinedBehaviorSanitizer-stdout.txt | 2 - .../CTestMemcheck/DummyValgrind-result.txt | 1 - .../CTestMemcheck/DummyValgrind-stderr.txt | 3 - .../CTestMemcheck/DummyValgrind-stdout.txt | 6 - .../DummyValgrindCustomOptions-result.txt | 1 - .../DummyValgrindCustomOptions-stderr.txt | 2 - .../DummyValgrindCustomOptions-stdout.txt | 6 - .../CTestMemcheck/DummyValgrindFailPost-result.txt | 1 - .../CTestMemcheck/DummyValgrindFailPost-stderr.txt | 3 - .../CTestMemcheck/DummyValgrindFailPost-stdout.txt | 6 - .../CTestMemcheck/DummyValgrindFailPre-result.txt | 1 - .../CTestMemcheck/DummyValgrindFailPre-stderr.txt | 3 - .../CTestMemcheck/DummyValgrindFailPre-stdout.txt | 1 - .../DummyValgrindIgnoreMemcheck-result.txt | 1 - .../DummyValgrindIgnoreMemcheck-stderr.txt | 3 - .../DummyValgrindIgnoreMemcheck-stdout.txt | 7 -- .../DummyValgrindInvalidSupFile-result.txt | 1 - .../DummyValgrindInvalidSupFile-stderr.txt | 2 - .../DummyValgrindInvalidSupFile-stdout.txt | 1 - .../DummyValgrindNoLogFile-result.txt | 1 - .../DummyValgrindNoLogFile-stderr.txt | 2 - .../DummyValgrindNoLogFile-stdout.txt | 3 - .../CTestMemcheck/DummyValgrindPrePost-result.txt | 1 - .../CTestMemcheck/DummyValgrindPrePost-stderr.txt | 3 - .../CTestMemcheck/DummyValgrindPrePost-stdout.txt | 6 - .../DummyValgrindTwoTargets-result.txt | 1 - .../DummyValgrindTwoTargets-stderr.txt | 3 - .../DummyValgrindTwoTargets-stdout.txt | 8 -- Tests/RunCMake/CTestMemcheck/NotExist-result.txt | 1 - Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt | 1 - Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt | 1 - Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake | 132 --------------------- Tests/RunCMake/CTestMemcheck/Unknown-result.txt | 1 - Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt | 2 - Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt | 1 - Tests/RunCMake/CTestMemcheck/test.cmake.in | 24 ---- .../CTestMemcheck/testAddressSanitizer.cmake | 58 --------- .../RunCMake/CTestMemcheck/testLeakSanitizer.cmake | 47 -------- .../CTestMemcheck/testMemorySanitizer.cmake | 27 ----- .../CTestMemcheck/testThreadSanitizer.cmake | 47 -------- .../testUndefinedBehaviorSanitizer.cmake | 21 ---- Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in | 7 ++ Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in | 9 ++ .../DummyAddressSanitizer-result.txt | 1 + .../DummyAddressSanitizer-stderr.txt | 2 + .../DummyAddressSanitizer-stdout.txt | 2 + Tests/RunCMake/ctest_memcheck/DummyBC-result.txt | 1 + Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt | 1 + Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt | 3 + .../ctest_memcheck/DummyBCNoLogFile-result.txt | 1 + .../ctest_memcheck/DummyBCNoLogFile-stderr.txt | 3 + .../ctest_memcheck/DummyBCNoLogFile-stdout.txt | 3 + .../ctest_memcheck/DummyLeakSanitizer-result.txt | 1 + .../ctest_memcheck/DummyLeakSanitizer-stderr.txt | 2 + .../ctest_memcheck/DummyLeakSanitizer-stdout.txt | 3 + .../ctest_memcheck/DummyMemorySanitizer-result.txt | 1 + .../ctest_memcheck/DummyMemorySanitizer-stderr.txt | 2 + .../ctest_memcheck/DummyMemorySanitizer-stdout.txt | 2 + .../RunCMake/ctest_memcheck/DummyPurify-result.txt | 1 + .../RunCMake/ctest_memcheck/DummyPurify-stderr.txt | 3 + .../RunCMake/ctest_memcheck/DummyPurify-stdout.txt | 6 + .../ctest_memcheck/DummyPurifyNoLogFile-result.txt | 1 + .../ctest_memcheck/DummyPurifyNoLogFile-stderr.txt | 2 + .../ctest_memcheck/DummyPurifyNoLogFile-stdout.txt | 3 + .../ctest_memcheck/DummyThreadSanitizer-result.txt | 1 + .../ctest_memcheck/DummyThreadSanitizer-stderr.txt | 2 + .../ctest_memcheck/DummyThreadSanitizer-stdout.txt | 13 ++ .../DummyUndefinedBehaviorSanitizer-result.txt | 1 + .../DummyUndefinedBehaviorSanitizer-stderr.txt | 2 + .../DummyUndefinedBehaviorSanitizer-stdout.txt | 2 + .../ctest_memcheck/DummyValgrind-result.txt | 1 + .../ctest_memcheck/DummyValgrind-stderr.txt | 3 + .../ctest_memcheck/DummyValgrind-stdout.txt | 6 + .../DummyValgrindCustomOptions-result.txt | 1 + .../DummyValgrindCustomOptions-stderr.txt | 2 + .../DummyValgrindCustomOptions-stdout.txt | 6 + .../DummyValgrindFailPost-result.txt | 1 + .../DummyValgrindFailPost-stderr.txt | 3 + .../DummyValgrindFailPost-stdout.txt | 6 + .../ctest_memcheck/DummyValgrindFailPre-result.txt | 1 + .../ctest_memcheck/DummyValgrindFailPre-stderr.txt | 3 + .../ctest_memcheck/DummyValgrindFailPre-stdout.txt | 1 + .../DummyValgrindIgnoreMemcheck-result.txt | 1 + .../DummyValgrindIgnoreMemcheck-stderr.txt | 3 + .../DummyValgrindIgnoreMemcheck-stdout.txt | 7 ++ .../DummyValgrindInvalidSupFile-result.txt | 1 + .../DummyValgrindInvalidSupFile-stderr.txt | 2 + .../DummyValgrindInvalidSupFile-stdout.txt | 1 + .../DummyValgrindNoLogFile-result.txt | 1 + .../DummyValgrindNoLogFile-stderr.txt | 2 + .../DummyValgrindNoLogFile-stdout.txt | 3 + .../ctest_memcheck/DummyValgrindPrePost-result.txt | 1 + .../ctest_memcheck/DummyValgrindPrePost-stderr.txt | 3 + .../ctest_memcheck/DummyValgrindPrePost-stdout.txt | 6 + .../DummyValgrindTwoTargets-result.txt | 1 + .../DummyValgrindTwoTargets-stderr.txt | 3 + .../DummyValgrindTwoTargets-stdout.txt | 8 ++ Tests/RunCMake/ctest_memcheck/NotExist-result.txt | 1 + Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt | 1 + Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt | 1 + Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake | 132 +++++++++++++++++++++ Tests/RunCMake/ctest_memcheck/Unknown-result.txt | 1 + Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt | 2 + Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt | 1 + Tests/RunCMake/ctest_memcheck/test.cmake.in | 24 ++++ .../ctest_memcheck/testAddressSanitizer.cmake | 58 +++++++++ .../ctest_memcheck/testLeakSanitizer.cmake | 47 ++++++++ .../ctest_memcheck/testMemorySanitizer.cmake | 27 +++++ .../ctest_memcheck/testThreadSanitizer.cmake | 47 ++++++++ .../testUndefinedBehaviorSanitizer.cmake | 21 ++++ 139 files changed, 522 insertions(+), 522 deletions(-) delete mode 100644 Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in delete mode 100644 Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBC-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurify-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrind-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-result.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt delete mode 100644 Tests/RunCMake/CTestMemcheck/test.cmake.in delete mode 100644 Tests/RunCMake/CTestMemcheck/testAddressSanitizer.cmake delete mode 100644 Tests/RunCMake/CTestMemcheck/testLeakSanitizer.cmake delete mode 100644 Tests/RunCMake/CTestMemcheck/testMemorySanitizer.cmake delete mode 100644 Tests/RunCMake/CTestMemcheck/testThreadSanitizer.cmake delete mode 100644 Tests/RunCMake/CTestMemcheck/testUndefinedBehaviorSanitizer.cmake create mode 100644 Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in create mode 100644 Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBC-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurify-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrind-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/NotExist-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-result.txt create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt create mode 100644 Tests/RunCMake/ctest_memcheck/test.cmake.in create mode 100644 Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake create mode 100644 Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake create mode 100644 Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake create mode 100644 Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake create mode 100644 Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 44e6ec4..59c6918 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -66,7 +66,7 @@ add_RunCMake_test(CMP0055) add_RunCMake_test(CTest) if(NOT CMake_TEST_EXTERNAL_CMAKE) - add_RunCMake_test(CTestMemcheck + add_RunCMake_test(ctest_memcheck -DPSEUDO_BC=$ -DPSEUDO_PURIFY=$ -DPSEUDO_VALGRIND=$ diff --git a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in deleted file mode 100644 index 3b8edf4..0000000 --- a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 2.8.9) -project(CTestTestMemcheck@CASE_NAME@ NONE) -include(CTest) - -add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version) - -@CMAKELISTS_EXTRA_CODE@ diff --git a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in deleted file mode 100644 index 6d4a718..0000000 --- a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in +++ /dev/null @@ -1,9 +0,0 @@ -set (CTEST_PROJECT_NAME "CTestTestMemcheck@CASE_NAME@") -set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT") -set (CTEST_DART_SERVER_VERSION "2") -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "open.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=PublicDashboard") -set(CTEST_DROP_SITE_CDASH TRUE) - -@CTEST_EXTRA_CONFIG@ diff --git a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt b/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt deleted file mode 100644 index 725270c..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt deleted file mode 100644 index 1d255d0..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt +++ /dev/null @@ -1,2 +0,0 @@ -Memory checking results: -heap-buffer-overflow - 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-result.txt b/Tests/RunCMake/CTestMemcheck/DummyBC-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyBC-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt deleted file mode 100644 index 24f536a..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -Error parsing XML in stream at line 1: no element found diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt deleted file mode 100644 index 5829613..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt b/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt deleted file mode 100644 index 634e331..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log -.*Error parsing XML in stream at line 1: no element found -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt deleted file mode 100644 index 5829613..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt b/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt deleted file mode 100644 index 520222f..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt deleted file mode 100644 index 97a8a9b..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -Memory checking results: -Direct leak - 2 -Indirect leak - 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt b/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt deleted file mode 100644 index 29c6ec7..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt deleted file mode 100644 index 64390c7..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt +++ /dev/null @@ -1,2 +0,0 @@ -Memory checking results: -use-of-uninitialized-value - 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-result.txt b/Tests/RunCMake/CTestMemcheck/DummyPurify-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyPurify-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt deleted file mode 100644 index dabb004..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt +++ /dev/null @@ -1,6 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 -.* --- Processing memory checking output:( ) -Memory checking results: diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt b/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt deleted file mode 100644 index 2506f35..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt deleted file mode 100644 index 5829613..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt b/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt deleted file mode 100644 index ca23692..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt deleted file mode 100644 index c3af1f9..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt +++ /dev/null @@ -1,13 +0,0 @@ -Memory checking results: -data race - 1 -data race on vptr \(ctor/dtor vs virtual call\) - 1 -heap-use-after-free - 1 -thread leak - 1 -destroy of a locked mutex - 1 -double lock of a mutex - 1 -unlock of an unlocked mutex \(or by a wrong thread\) - 1 -read lock of a write locked mutex - 1 -read unlock of a write locked mutex - 1 -signal-unsafe call inside of a signal - 1 -signal handler spoils errno - 1 -lock-order-inversion \(potential deadlock\) - 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt b/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt deleted file mode 100644 index fd684da..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt deleted file mode 100644 index b3473bf..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt +++ /dev/null @@ -1,2 +0,0 @@ -Memory checking results: -left shift of negative value -256 - 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrind-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrind-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt deleted file mode 100644 index dabb004..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt +++ /dev/null @@ -1,6 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 -.* --- Processing memory checking output:( ) -Memory checking results: diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt deleted file mode 100644 index 1a2ee5c..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt deleted file mode 100644 index dabb004..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt +++ /dev/null @@ -1,6 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 -.* --- Processing memory checking output:( ) -Memory checking results: diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt deleted file mode 100644 index 2d078ef..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -Problem running command: .*memcheck_fail.* -Problem executing post-memcheck command\(s\). -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt deleted file mode 100644 index dabb004..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt +++ /dev/null @@ -1,6 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 -.* --- Processing memory checking output:( ) -Memory checking results: diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt deleted file mode 100644 index 43ccb2e..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -Problem running command: .*memcheck_fail.* -Problem executing pre-memcheck command\(s\). -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt deleted file mode 100644 index 9a6a1d6..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Memory check project .*/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-build diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt deleted file mode 100644 index 5a5675c..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt +++ /dev/null @@ -1,7 +0,0 @@ -2/2 Test #2: RunCMakeAgain .* -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 -.* --- Processing memory checking output:( ) -Memory checking results: diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt deleted file mode 100644 index d8d1ff0..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory checker suppression file: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-build/does-not-exist -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt deleted file mode 100644 index d46912e..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Memory check project .*/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-build$ diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt deleted file mode 100644 index 321a2a5..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log -Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt deleted file mode 100644 index 5829613..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt deleted file mode 100644 index dabb004..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt +++ /dev/null @@ -1,6 +0,0 @@ -1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec - -100% tests passed, 0 tests failed out of 1 -.* --- Processing memory checking output:( ) -Memory checking results: diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-result.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt deleted file mode 100644 index 3e0fdb2..0000000 --- a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt +++ /dev/null @@ -1,8 +0,0 @@ -Memory check project .*/DummyValgrindTwoTargets-build -.* - *Start 1: RunCMake -(.* -)?Memory check command: .* \"--log-file=.*/DummyValgrindTwoTargets-build/Testing/Temporary/MemoryChecker.1.log\" \"-q\".* - *Start 2: RunCMakeAgain -(.* -)?Memory check command: .* \"--log-file=.*/DummyValgrindTwoTargets-build/Testing/Temporary/MemoryChecker.2.log\" \"-q\".* diff --git a/Tests/RunCMake/CTestMemcheck/NotExist-result.txt b/Tests/RunCMake/CTestMemcheck/NotExist-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CTestMemcheck/NotExist-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt b/Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt deleted file mode 100644 index 0af5b7a..0000000 --- a/Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -Memory checker \(MemoryCheckCommand\) not set, or cannot find the specified program\. diff --git a/Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt b/Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt deleted file mode 100644 index 9e92266..0000000 --- a/Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Memory check project .*/Tests/RunCMake/CTestMemcheck/NotExist-build$ diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake deleted file mode 100644 index b1793fa..0000000 --- a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake +++ /dev/null @@ -1,132 +0,0 @@ -include(RunCTest) - -set(SITE test-site) -set(BUILDNAME test-build) -set(COVERAGE_COMMAND "") - -function(run_mc_test CASE_NAME CHECKER_COMMAND) - run_ctest(${CASE_NAME} ${ARGN}) -endfunction() - -unset(CTEST_EXTRA_CONFIG) -unset(CTEST_EXTRA_CODE) -unset(CMAKELISTS_EXTRA_CODE) - -#----------------------------------------------------------------------------- -# add ThreadSanitizer test -set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\") -") -set(CMAKELISTS_EXTRA_CODE -"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" --P \"${RunCMake_SOURCE_DIR}/testThreadSanitizer.cmake\") -") -run_mc_test(DummyThreadSanitizer "" -DMEMCHECK_TYPE=ThreadSanitizer) -unset(CMAKELISTS_EXTRA_CODE) -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -# add LeakSanitizer test -set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\") -") -set(CMAKELISTS_EXTRA_CODE -"add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\" --P \"${RunCMake_SOURCE_DIR}/testLeakSanitizer.cmake\") -") -run_mc_test(DummyLeakSanitizer "" -DMEMCHECK_TYPE=AddressSanitizer) -unset(CMAKELISTS_EXTRA_CODE) -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -# add AddressSanitizer test -set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\") -") -set(CMAKELISTS_EXTRA_CODE -"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" --P \"${RunCMake_SOURCE_DIR}/testAddressSanitizer.cmake\") -") -run_mc_test(DummyAddressSanitizer "" -DMEMCHECK_TYPE=AddressSanitizer) -unset(CMAKELISTS_EXTRA_CODE) -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -# add MemorySanitizer test -set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\") -") -set(CMAKELISTS_EXTRA_CODE -"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" --P \"${RunCMake_SOURCE_DIR}/testMemorySanitizer.cmake\") -") -run_mc_test(DummyMemorySanitizer "" -DMEMCHECK_TYPE=MemorySanitizer) -unset(CMAKELISTS_EXTRA_CODE) -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -# add UndefinedBehaviorSanitizer test -set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1\") -") -set(CMAKELISTS_EXTRA_CODE -"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" --P \"${RunCMake_SOURCE_DIR}/testUndefinedBehaviorSanitizer.cmake\") -") -run_mc_test(DummyUndefinedBehaviorSanitizer "" -DMEMCHECK_TYPE=UndefinedBehaviorSanitizer) -unset(CMAKELISTS_EXTRA_CODE) -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -set(CTEST_EXTRA_CODE "string(REPLACE \" \" \"\\\\ \" PRE_POST_COMMAND \"\${CTEST_MEMORYCHECK_COMMAND}\") - -set(CTEST_CUSTOM_PRE_MEMCHECK \"\${PRE_POST_COMMAND} pre command\") -set(CTEST_CUSTOM_POST_MEMCHECK \"\${PRE_POST_COMMAND} post command \") -") -run_mc_test(DummyValgrindPrePost "${PSEUDO_VALGRIND}") -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_POST_MEMCHECK \"${MEMCHECK_FAIL}\")") -run_mc_test(DummyValgrindFailPost "${PSEUDO_VALGRIND}") -unset(CTEST_EXTRA_CODE) - -#----------------------------------------------------------------------------- -set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_PRE_MEMCHECK \"${MEMCHECK_FAIL}\")") -run_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)") -run_mc_test(DummyValgrindIgnoreMemcheck "${PSEUDO_VALGRIND}") -unset(CTEST_EXTRA_CONFIG) -unset(CMAKELISTS_EXTRA_CODE) - -#----------------------------------------------------------------------------- -set(CMAKELISTS_EXTRA_CODE "add_test(NAME RunCMakeAgain COMMAND \"\${CMAKE_COMMAND}\" --version)") -run_mc_test(DummyValgrindTwoTargets "${PSEUDO_VALGRIND}" "-VV") -unset(CMAKELISTS_EXTRA_CODE) - -#----------------------------------------------------------------------------- -set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE \"\${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\")") -run_mc_test(DummyValgrindInvalidSupFile "${PSEUDO_VALGRIND}") -unset(CTEST_EXTRA_CONFIG) - -#----------------------------------------------------------------------------- -# CTest will add the logfile option before any custom options. Set the logfile -# again, this time to an empty string. 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 \"--log-file=\")") -run_mc_test(DummyValgrindCustomOptions "${PSEUDO_VALGRIND}") -unset(CTEST_EXTRA_CONFIG) - -#----------------------------------------------------------------------------- -run_mc_test(DummyPurify "${PSEUDO_PURIFY}") -run_mc_test(DummyValgrind "${PSEUDO_VALGRIND}") -run_mc_test(DummyBC "${PSEUDO_BC}") -run_mc_test(DummyPurifyNoLogFile "${PSEUDO_PURIFY_NOLOG}") -run_mc_test(DummyValgrindNoLogFile "${PSEUDO_VALGRIND_NOLOG}") -run_mc_test(DummyBCNoLogFile "${PSEUDO_BC_NOLOG}") -run_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe") -run_mc_test(Unknown "\${CMAKE_COMMAND}") diff --git a/Tests/RunCMake/CTestMemcheck/Unknown-result.txt b/Tests/RunCMake/CTestMemcheck/Unknown-result.txt deleted file mode 100644 index b57e2de..0000000 --- a/Tests/RunCMake/CTestMemcheck/Unknown-result.txt +++ /dev/null @@ -1 +0,0 @@ -(-1|255) diff --git a/Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt b/Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt deleted file mode 100644 index 2beea2d..0000000 --- a/Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -Do not understand memory checker: .*/cmake.* -Error in read script: .*/Tests/RunCMake/CTestMemcheck/Unknown/test.cmake diff --git a/Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt b/Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt deleted file mode 100644 index 7ea1af0..0000000 --- a/Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -Memory check project .*/Tests/RunCMake/CTestMemcheck/Unknown-build$ diff --git a/Tests/RunCMake/CTestMemcheck/test.cmake.in b/Tests/RunCMake/CTestMemcheck/test.cmake.in deleted file mode 100644 index f9c1ba9..0000000 --- a/Tests/RunCMake/CTestMemcheck/test.cmake.in +++ /dev/null @@ -1,24 +0,0 @@ -cmake_minimum_required(VERSION 2.8.9) - -# Settings: -set(CTEST_SITE "@SITE@") -set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@CASE_NAME@") - -set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@") -set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build") -set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") -set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") -set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") -set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") -set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@") -set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") - -set(CTEST_MEMORYCHECK_COMMAND "@CHECKER_COMMAND@") -set(CTEST_MEMORYCHECK_TYPE "${MEMCHECK_TYPE}") - -@CTEST_EXTRA_CODE@ - -CTEST_START(Experimental) -CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) -CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) -CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) diff --git a/Tests/RunCMake/CTestMemcheck/testAddressSanitizer.cmake b/Tests/RunCMake/CTestMemcheck/testAddressSanitizer.cmake deleted file mode 100644 index 3082e4b..0000000 --- a/Tests/RunCMake/CTestMemcheck/testAddressSanitizer.cmake +++ /dev/null @@ -1,58 +0,0 @@ -# this file simulates a program that has been built with address sanitizer -# options - -message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]") -string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}") -message("LOG_FILE=[${LOG_FILE}]") - -# if we are not asked to simulate address sanitizer don't do it -if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") - return() -endif() -# clear the log file -file(REMOVE "${LOG_FILE}.2343") - -# create an example error from address santizer - -file(APPEND "${LOG_FILE}.2343" -"================================================================= -==19278== ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60080000bffc at pc 0x4009f1 bp 0x7fff82de6520 sp 0x7fff82de6518 -WRITE of size 4 at 0x60080000bffc thread T0 - #0 0x4009f0 (/home/kitware/msan/a.out+0x4009f0) - #1 0x7f18b02c876c (/lib/x86_64-linux-gnu/libc-2.15.so+0x2176c) - #2 0x400858 (/home/kitware/msan/a.out+0x400858) -0x60080000bffc is located 4 bytes to the right of 40-byte region [0x60080000bfd0,0x60080000bff8) -allocated by thread T0 here: - #0 0x7f18b088f9ca (/usr/lib/x86_64-linux-gnu/libasan.so.0.0.0+0x119ca) - #1 0x4009a2 (/home/kitware/msan/a.out+0x4009a2) - #2 0x7f18b02c876c (/lib/x86_64-linux-gnu/libc-2.15.so+0x2176c) -Shadow bytes around the buggy address: - 0x0c017fff97a0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff97b0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff97c0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff97d0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff97e0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa -=>0x0c017fff97f0: fa fa fa fa fa fa fa fa fa fa 00 00 00 00 00[fa] - 0x0c017fff9800:fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff9810: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff9820: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff9830: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa - 0x0c017fff9840: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa -Shadow byte legend (one shadow byte represents 8 application bytes): - Addressable: 00 - Partially addressable: 01 02 03 04 05 06 07 - Heap left redzone: fa - Heap righ redzone: fb - Freed Heap region: fd - Stack left redzone: f1 - Stack mid redzone: f2 - Stack right redzone: f3 - Stack partial redzone: f4 - Stack after return: f5 - Stack use after scope: f8 - Global redzone: f9 - Global init order: f6 - Poisoned by user: f7 - ASan internal: fe -==19278== ABORTING -") diff --git a/Tests/RunCMake/CTestMemcheck/testLeakSanitizer.cmake b/Tests/RunCMake/CTestMemcheck/testLeakSanitizer.cmake deleted file mode 100644 index 02030be..0000000 --- a/Tests/RunCMake/CTestMemcheck/testLeakSanitizer.cmake +++ /dev/null @@ -1,47 +0,0 @@ -# this file simulates a program that has been built with thread sanitizer -# options - -message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]") -string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}") -message("LOG_FILE=[${LOG_FILE}]") -# if we are not asked to simulate leak sanitizer don't do it -if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") - return() -endif() - -# clear the log file -file(REMOVE "${LOG_FILE}.2343") -file(REMOVE "${LOG_FILE}.2344") - -# create an error of each type of thread santizer -# these names come from tsan_report.cc in llvm - -file(APPEND "${LOG_FILE}.2343" -"================================================================= -==25308==ERROR: LeakSanitizer: detected memory leaks - -Direct leak of 4360 byte(s) in 1 object(s) allocated from: - #0 0x46c669 in operator new[](unsigned long) (/home/kitware/msan/a.out+0x46c669) - #1 0x4823b4 in main /home/kitware/msan/memcheck.cxx:12 - #2 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 - -SUMMARY: AddressSanitizer: 4436 byte(s) leaked in 2 allocation(s). -") -file(APPEND "${LOG_FILE}.2342" -"================================================================= -==25308==ERROR: LeakSanitizer: detected memory leaks - -Direct leak of 76 byte(s) in 1 object(s) allocated from: - #0 0x46c669 in operator new[](unsigned long) (/home/kitware/msan/a.out+0x46c669) - #1 0x4821b8 in foo() /home/kitware/msan/memcheck.cxx:4 - #2 0x4823f2 in main /home/kitware/msan/memcheck.cxx:14 - #3 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 - -Indirect leak of 76 byte(s) in 1 object(s) allocated from: - #0 0x46c669 in operator new[](unsigned long) (/home/kitware/msan/a.out+0x46c669) - #1 0x4821b8 in foo() /home/kitware/msan/memcheck.cxx:4 - #2 0x4823f2 in main /home/kitware/msan/memcheck.cxx:14 - #3 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 - -SUMMARY: AddressSanitizer: 4436 byte(s) leaked in 2 allocation(s). -") diff --git a/Tests/RunCMake/CTestMemcheck/testMemorySanitizer.cmake b/Tests/RunCMake/CTestMemcheck/testMemorySanitizer.cmake deleted file mode 100644 index c87af9a..0000000 --- a/Tests/RunCMake/CTestMemcheck/testMemorySanitizer.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# this file simulates a program that has been built with thread sanitizer -# options - -message("MSAN_OPTIONS = [$ENV{MSAN_OPTIONS}]") -string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}") -message("LOG_FILE=[${LOG_FILE}]") - -# if we are not asked to simulate address sanitizer don't do it -if(NOT "$ENV{MSAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") - return() -endif() -# clear the log file -file(REMOVE "${LOG_FILE}.2343") - -# create an error of each type of thread santizer -# these names come from tsan_report.cc in llvm - -file(APPEND "${LOG_FILE}.2343" -"================================================================= -==28423== WARNING: MemorySanitizer: use-of-uninitialized-value - #0 0x7f4364210dd9 in main (/home/kitware/msan/msan-bin/umr+0x7bdd9) - #1 0x7f4362d9376c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 - #2 0x7f4364210b0c in _start (/home/kitware/msan/msan-bin/umr+0x7bb0c) - -SUMMARY: MemorySanitizer: use-of-uninitialized-value ??:0 main -Exiting -") diff --git a/Tests/RunCMake/CTestMemcheck/testThreadSanitizer.cmake b/Tests/RunCMake/CTestMemcheck/testThreadSanitizer.cmake deleted file mode 100644 index d591931..0000000 --- a/Tests/RunCMake/CTestMemcheck/testThreadSanitizer.cmake +++ /dev/null @@ -1,47 +0,0 @@ -# this file simulates a program that has been built with thread sanitizer -# options - -message("TSAN_OPTIONS = [$ENV{TSAN_OPTIONS}]") -string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}") -message("LOG_FILE=[${LOG_FILE}]") - -set(error_types - "data race" - "data race on vptr (ctor/dtor vs virtual call)" - "heap-use-after-free" - "thread leak" - "destroy of a locked mutex" - "double lock of a mutex" - "unlock of an unlocked mutex (or by a wrong thread)" - "read lock of a write locked mutex" - "read unlock of a write locked mutex" - "signal-unsafe call inside of a signal" - "signal handler spoils errno" - "lock-order-inversion (potential deadlock)" - ) - -# clear the log file -file(REMOVE "${LOG_FILE}.2343") - -# create an error of each type of thread santizer -# these names come from tsan_report.cc in llvm -foreach(error_type ${error_types} ) - - file(APPEND "${LOG_FILE}.2343" -"================== -WARNING: ThreadSanitizer: ${error_type} (pid=27978) - Write of size 4 at 0x7fe017ce906c by thread T1: - #0 Thread1 ??:0 (exe+0x000000000bb0) - #1 :0 (libtsan.so.0+0x00000001b279) - - Previous write of size 4 at 0x7fe017ce906c by main thread: - #0 main ??:0 (exe+0x000000000c3c) - - Thread T1 (tid=27979, running) created by main thread at: - #0 :0 (libtsan.so.0+0x00000001ed7b) - #1 main ??:0 (exe+0x000000000c2c) - -SUMMARY: ThreadSanitizer: ${error_type} ??:0 Thread1 -================== -") -endforeach() diff --git a/Tests/RunCMake/CTestMemcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/CTestMemcheck/testUndefinedBehaviorSanitizer.cmake deleted file mode 100644 index 8ef3c0a..0000000 --- a/Tests/RunCMake/CTestMemcheck/testUndefinedBehaviorSanitizer.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# this file simulates a program that has been built with undefined behavior -# sanitizer options - -message("UBSAN_OPTIONS = [$ENV{UBSAN_OPTIONS}]") -string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}") -message("LOG_FILE=[${LOG_FILE}]") - -# if we are not asked to simulate address sanitizer don't do it -if(NOT "$ENV{UBSAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") - return() -endif() -# clear the log file -file(REMOVE "${LOG_FILE}.2343") - -# create an error like undefined behavior santizer creates; -# these names come from ubsan_diag.cc and ubsan_handlers.cc -# in llvm - -file(APPEND "${LOG_FILE}.2343" -": runtime error: left shift of negative value -256 -") diff --git a/Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in b/Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in new file mode 100644 index 0000000..3b8edf4 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 2.8.9) +project(CTestTestMemcheck@CASE_NAME@ NONE) +include(CTest) + +add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version) + +@CMAKELISTS_EXTRA_CODE@ diff --git a/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in b/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in new file mode 100644 index 0000000..6d4a718 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in @@ -0,0 +1,9 @@ +set (CTEST_PROJECT_NAME "CTestTestMemcheck@CASE_NAME@") +set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT") +set (CTEST_DART_SERVER_VERSION "2") +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "open.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=PublicDashboard") +set(CTEST_DROP_SITE_CDASH TRUE) + +@CTEST_EXTRA_CONFIG@ diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt new file mode 100644 index 0000000..00f4779 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stdout.txt new file mode 100644 index 0000000..1d255d0 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stdout.txt @@ -0,0 +1,2 @@ +Memory checking results: +heap-buffer-overflow - 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt new file mode 100644 index 0000000..24f536a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt @@ -0,0 +1 @@ +Error parsing XML in stream at line 1: no element found diff --git a/Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt new file mode 100644 index 0000000..5829613 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt @@ -0,0 +1,3 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt new file mode 100644 index 0000000..5c582ac --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt @@ -0,0 +1,3 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log +.*Error parsing XML in stream at line 1: no element found +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stdout.txt new file mode 100644 index 0000000..5829613 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stdout.txt @@ -0,0 +1,3 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt new file mode 100644 index 0000000..c099340 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stdout.txt new file mode 100644 index 0000000..97a8a9b --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stdout.txt @@ -0,0 +1,3 @@ +Memory checking results: +Direct leak - 2 +Indirect leak - 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt new file mode 100644 index 0000000..6c42ec1 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stdout.txt new file mode 100644 index 0000000..64390c7 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stdout.txt @@ -0,0 +1,2 @@ +Memory checking results: +use-of-uninitialized-value - 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-result.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyPurify-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt new file mode 100644 index 0000000..14bc228 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt @@ -0,0 +1,3 @@ +^((^| +)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ +]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt new file mode 100644 index 0000000..dabb004 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt @@ -0,0 +1,6 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 +.* +-- Processing memory checking output:( ) +Memory checking results: diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt new file mode 100644 index 0000000..41120b5 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stdout.txt new file mode 100644 index 0000000..5829613 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stdout.txt @@ -0,0 +1,3 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt new file mode 100644 index 0000000..cb353ad --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stdout.txt new file mode 100644 index 0000000..c3af1f9 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stdout.txt @@ -0,0 +1,13 @@ +Memory checking results: +data race - 1 +data race on vptr \(ctor/dtor vs virtual call\) - 1 +heap-use-after-free - 1 +thread leak - 1 +destroy of a locked mutex - 1 +double lock of a mutex - 1 +unlock of an unlocked mutex \(or by a wrong thread\) - 1 +read lock of a write locked mutex - 1 +read unlock of a write locked mutex - 1 +signal-unsafe call inside of a signal - 1 +signal handler spoils errno - 1 +lock-order-inversion \(potential deadlock\) - 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt new file mode 100644 index 0000000..7ce798c --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\* +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stdout.txt new file mode 100644 index 0000000..b3473bf --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stdout.txt @@ -0,0 +1,2 @@ +Memory checking results: +left shift of negative value -256 - 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrind-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt new file mode 100644 index 0000000..14bc228 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt @@ -0,0 +1,3 @@ +^((^| +)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ +]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt new file mode 100644 index 0000000..dabb004 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt @@ -0,0 +1,6 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 +.* +-- Processing memory checking output:( ) +Memory checking results: diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt new file mode 100644 index 0000000..97bb833 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt new file mode 100644 index 0000000..dabb004 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt @@ -0,0 +1,6 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 +.* +-- Processing memory checking output:( ) +Memory checking results: diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt new file mode 100644 index 0000000..0c997ff --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt @@ -0,0 +1,3 @@ +Problem running command: .*memcheck_fail.* +Problem executing post-memcheck command\(s\). +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt new file mode 100644 index 0000000..dabb004 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt @@ -0,0 +1,6 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 +.* +-- Processing memory checking output:( ) +Memory checking results: diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt new file mode 100644 index 0000000..1d1b1e7 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt @@ -0,0 +1,3 @@ +Problem running command: .*memcheck_fail.* +Problem executing pre-memcheck command\(s\). +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt new file mode 100644 index 0000000..8d8b7e9 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt @@ -0,0 +1 @@ +Memory check project .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-build diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt new file mode 100644 index 0000000..14bc228 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt @@ -0,0 +1,3 @@ +^((^| +)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ +]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt new file mode 100644 index 0000000..5a5675c --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt @@ -0,0 +1,7 @@ +2/2 Test #2: RunCMakeAgain .* +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 +.* +-- Processing memory checking output:( ) +Memory checking results: diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt new file mode 100644 index 0000000..65beb81 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory checker suppression file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build/does-not-exist +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt new file mode 100644 index 0000000..4c58df4 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt @@ -0,0 +1 @@ +Memory check project .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt new file mode 100644 index 0000000..e2a836f --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt @@ -0,0 +1,2 @@ +Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log +Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stdout.txt new file mode 100644 index 0000000..5829613 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stdout.txt @@ -0,0 +1,3 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt new file mode 100644 index 0000000..14bc228 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt @@ -0,0 +1,3 @@ +^((^| +)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ +]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt new file mode 100644 index 0000000..dabb004 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt @@ -0,0 +1,6 @@ +1/1 MemCheck #1: RunCMake \.+ Passed +[0-9]+.[0-9]+ sec + +100% tests passed, 0 tests failed out of 1 +.* +-- Processing memory checking output:( ) +Memory checking results: diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt new file mode 100644 index 0000000..14bc228 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt @@ -0,0 +1,3 @@ +^((^| +)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ +]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stdout.txt new file mode 100644 index 0000000..3e0fdb2 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stdout.txt @@ -0,0 +1,8 @@ +Memory check project .*/DummyValgrindTwoTargets-build +.* + *Start 1: RunCMake +(.* +)?Memory check command: .* \"--log-file=.*/DummyValgrindTwoTargets-build/Testing/Temporary/MemoryChecker.1.log\" \"-q\".* + *Start 2: RunCMakeAgain +(.* +)?Memory check command: .* \"--log-file=.*/DummyValgrindTwoTargets-build/Testing/Temporary/MemoryChecker.2.log\" \"-q\".* diff --git a/Tests/RunCMake/ctest_memcheck/NotExist-result.txt b/Tests/RunCMake/ctest_memcheck/NotExist-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/NotExist-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt b/Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt new file mode 100644 index 0000000..0af5b7a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt @@ -0,0 +1 @@ +Memory checker \(MemoryCheckCommand\) not set, or cannot find the specified program\. diff --git a/Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt b/Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt new file mode 100644 index 0000000..0e58936 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt @@ -0,0 +1 @@ +Memory check project .*/Tests/RunCMake/ctest_memcheck/NotExist-build$ diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake new file mode 100644 index 0000000..b1793fa --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake @@ -0,0 +1,132 @@ +include(RunCTest) + +set(SITE test-site) +set(BUILDNAME test-build) +set(COVERAGE_COMMAND "") + +function(run_mc_test CASE_NAME CHECKER_COMMAND) + run_ctest(${CASE_NAME} ${ARGN}) +endfunction() + +unset(CTEST_EXTRA_CONFIG) +unset(CTEST_EXTRA_CODE) +unset(CMAKELISTS_EXTRA_CODE) + +#----------------------------------------------------------------------------- +# add ThreadSanitizer test +set(CTEST_EXTRA_CODE +"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\") +") +set(CMAKELISTS_EXTRA_CODE +"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" +-P \"${RunCMake_SOURCE_DIR}/testThreadSanitizer.cmake\") +") +run_mc_test(DummyThreadSanitizer "" -DMEMCHECK_TYPE=ThreadSanitizer) +unset(CMAKELISTS_EXTRA_CODE) +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +# add LeakSanitizer test +set(CTEST_EXTRA_CODE +"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\") +") +set(CMAKELISTS_EXTRA_CODE +"add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\" +-P \"${RunCMake_SOURCE_DIR}/testLeakSanitizer.cmake\") +") +run_mc_test(DummyLeakSanitizer "" -DMEMCHECK_TYPE=AddressSanitizer) +unset(CMAKELISTS_EXTRA_CODE) +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +# add AddressSanitizer test +set(CTEST_EXTRA_CODE +"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\") +") +set(CMAKELISTS_EXTRA_CODE +"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" +-P \"${RunCMake_SOURCE_DIR}/testAddressSanitizer.cmake\") +") +run_mc_test(DummyAddressSanitizer "" -DMEMCHECK_TYPE=AddressSanitizer) +unset(CMAKELISTS_EXTRA_CODE) +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +# add MemorySanitizer test +set(CTEST_EXTRA_CODE +"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\") +") +set(CMAKELISTS_EXTRA_CODE +"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" +-P \"${RunCMake_SOURCE_DIR}/testMemorySanitizer.cmake\") +") +run_mc_test(DummyMemorySanitizer "" -DMEMCHECK_TYPE=MemorySanitizer) +unset(CMAKELISTS_EXTRA_CODE) +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +# add UndefinedBehaviorSanitizer test +set(CTEST_EXTRA_CODE +"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1\") +") +set(CMAKELISTS_EXTRA_CODE +"add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" +-P \"${RunCMake_SOURCE_DIR}/testUndefinedBehaviorSanitizer.cmake\") +") +run_mc_test(DummyUndefinedBehaviorSanitizer "" -DMEMCHECK_TYPE=UndefinedBehaviorSanitizer) +unset(CMAKELISTS_EXTRA_CODE) +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +set(CTEST_EXTRA_CODE "string(REPLACE \" \" \"\\\\ \" PRE_POST_COMMAND \"\${CTEST_MEMORYCHECK_COMMAND}\") + +set(CTEST_CUSTOM_PRE_MEMCHECK \"\${PRE_POST_COMMAND} pre command\") +set(CTEST_CUSTOM_POST_MEMCHECK \"\${PRE_POST_COMMAND} post command \") +") +run_mc_test(DummyValgrindPrePost "${PSEUDO_VALGRIND}") +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_POST_MEMCHECK \"${MEMCHECK_FAIL}\")") +run_mc_test(DummyValgrindFailPost "${PSEUDO_VALGRIND}") +unset(CTEST_EXTRA_CODE) + +#----------------------------------------------------------------------------- +set(CTEST_EXTRA_CODE "set(CTEST_CUSTOM_PRE_MEMCHECK \"${MEMCHECK_FAIL}\")") +run_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)") +run_mc_test(DummyValgrindIgnoreMemcheck "${PSEUDO_VALGRIND}") +unset(CTEST_EXTRA_CONFIG) +unset(CMAKELISTS_EXTRA_CODE) + +#----------------------------------------------------------------------------- +set(CMAKELISTS_EXTRA_CODE "add_test(NAME RunCMakeAgain COMMAND \"\${CMAKE_COMMAND}\" --version)") +run_mc_test(DummyValgrindTwoTargets "${PSEUDO_VALGRIND}" "-VV") +unset(CMAKELISTS_EXTRA_CODE) + +#----------------------------------------------------------------------------- +set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE \"\${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\")") +run_mc_test(DummyValgrindInvalidSupFile "${PSEUDO_VALGRIND}") +unset(CTEST_EXTRA_CONFIG) + +#----------------------------------------------------------------------------- +# CTest will add the logfile option before any custom options. Set the logfile +# again, this time to an empty string. 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 \"--log-file=\")") +run_mc_test(DummyValgrindCustomOptions "${PSEUDO_VALGRIND}") +unset(CTEST_EXTRA_CONFIG) + +#----------------------------------------------------------------------------- +run_mc_test(DummyPurify "${PSEUDO_PURIFY}") +run_mc_test(DummyValgrind "${PSEUDO_VALGRIND}") +run_mc_test(DummyBC "${PSEUDO_BC}") +run_mc_test(DummyPurifyNoLogFile "${PSEUDO_PURIFY_NOLOG}") +run_mc_test(DummyValgrindNoLogFile "${PSEUDO_VALGRIND_NOLOG}") +run_mc_test(DummyBCNoLogFile "${PSEUDO_BC_NOLOG}") +run_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe") +run_mc_test(Unknown "\${CMAKE_COMMAND}") diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-result.txt b/Tests/RunCMake/ctest_memcheck/Unknown-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/Unknown-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt new file mode 100644 index 0000000..99df8b3 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt @@ -0,0 +1,2 @@ +Do not understand memory checker: .*/cmake.* +Error in read script: .*/Tests/RunCMake/ctest_memcheck/Unknown/test.cmake diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt new file mode 100644 index 0000000..0208e80 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt @@ -0,0 +1 @@ +Memory check project .*/Tests/RunCMake/ctest_memcheck/Unknown-build$ diff --git a/Tests/RunCMake/ctest_memcheck/test.cmake.in b/Tests/RunCMake/ctest_memcheck/test.cmake.in new file mode 100644 index 0000000..f9c1ba9 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/test.cmake.in @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 2.8.9) + +# Settings: +set(CTEST_SITE "@SITE@") +set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@CASE_NAME@") + +set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@") +set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build") +set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") +set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") +set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") +set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") +set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@") +set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") + +set(CTEST_MEMORYCHECK_COMMAND "@CHECKER_COMMAND@") +set(CTEST_MEMORYCHECK_TYPE "${MEMCHECK_TYPE}") + +@CTEST_EXTRA_CODE@ + +CTEST_START(Experimental) +CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) +CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) +CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake new file mode 100644 index 0000000..3082e4b --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake @@ -0,0 +1,58 @@ +# this file simulates a program that has been built with address sanitizer +# options + +message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]") +string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}") +message("LOG_FILE=[${LOG_FILE}]") + +# if we are not asked to simulate address sanitizer don't do it +if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") + return() +endif() +# clear the log file +file(REMOVE "${LOG_FILE}.2343") + +# create an example error from address santizer + +file(APPEND "${LOG_FILE}.2343" +"================================================================= +==19278== ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60080000bffc at pc 0x4009f1 bp 0x7fff82de6520 sp 0x7fff82de6518 +WRITE of size 4 at 0x60080000bffc thread T0 + #0 0x4009f0 (/home/kitware/msan/a.out+0x4009f0) + #1 0x7f18b02c876c (/lib/x86_64-linux-gnu/libc-2.15.so+0x2176c) + #2 0x400858 (/home/kitware/msan/a.out+0x400858) +0x60080000bffc is located 4 bytes to the right of 40-byte region [0x60080000bfd0,0x60080000bff8) +allocated by thread T0 here: + #0 0x7f18b088f9ca (/usr/lib/x86_64-linux-gnu/libasan.so.0.0.0+0x119ca) + #1 0x4009a2 (/home/kitware/msan/a.out+0x4009a2) + #2 0x7f18b02c876c (/lib/x86_64-linux-gnu/libc-2.15.so+0x2176c) +Shadow bytes around the buggy address: + 0x0c017fff97a0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff97b0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff97c0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff97d0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff97e0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa +=>0x0c017fff97f0: fa fa fa fa fa fa fa fa fa fa 00 00 00 00 00[fa] + 0x0c017fff9800:fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff9810: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff9820: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff9830: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c017fff9840: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa +Shadow byte legend (one shadow byte represents 8 application bytes): + Addressable: 00 + Partially addressable: 01 02 03 04 05 06 07 + Heap left redzone: fa + Heap righ redzone: fb + Freed Heap region: fd + Stack left redzone: f1 + Stack mid redzone: f2 + Stack right redzone: f3 + Stack partial redzone: f4 + Stack after return: f5 + Stack use after scope: f8 + Global redzone: f9 + Global init order: f6 + Poisoned by user: f7 + ASan internal: fe +==19278== ABORTING +") diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake new file mode 100644 index 0000000..02030be --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake @@ -0,0 +1,47 @@ +# this file simulates a program that has been built with thread sanitizer +# options + +message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]") +string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}") +message("LOG_FILE=[${LOG_FILE}]") +# if we are not asked to simulate leak sanitizer don't do it +if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") + return() +endif() + +# clear the log file +file(REMOVE "${LOG_FILE}.2343") +file(REMOVE "${LOG_FILE}.2344") + +# create an error of each type of thread santizer +# these names come from tsan_report.cc in llvm + +file(APPEND "${LOG_FILE}.2343" +"================================================================= +==25308==ERROR: LeakSanitizer: detected memory leaks + +Direct leak of 4360 byte(s) in 1 object(s) allocated from: + #0 0x46c669 in operator new[](unsigned long) (/home/kitware/msan/a.out+0x46c669) + #1 0x4823b4 in main /home/kitware/msan/memcheck.cxx:12 + #2 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 + +SUMMARY: AddressSanitizer: 4436 byte(s) leaked in 2 allocation(s). +") +file(APPEND "${LOG_FILE}.2342" +"================================================================= +==25308==ERROR: LeakSanitizer: detected memory leaks + +Direct leak of 76 byte(s) in 1 object(s) allocated from: + #0 0x46c669 in operator new[](unsigned long) (/home/kitware/msan/a.out+0x46c669) + #1 0x4821b8 in foo() /home/kitware/msan/memcheck.cxx:4 + #2 0x4823f2 in main /home/kitware/msan/memcheck.cxx:14 + #3 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 + +Indirect leak of 76 byte(s) in 1 object(s) allocated from: + #0 0x46c669 in operator new[](unsigned long) (/home/kitware/msan/a.out+0x46c669) + #1 0x4821b8 in foo() /home/kitware/msan/memcheck.cxx:4 + #2 0x4823f2 in main /home/kitware/msan/memcheck.cxx:14 + #3 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 + +SUMMARY: AddressSanitizer: 4436 byte(s) leaked in 2 allocation(s). +") diff --git a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake new file mode 100644 index 0000000..c87af9a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake @@ -0,0 +1,27 @@ +# this file simulates a program that has been built with thread sanitizer +# options + +message("MSAN_OPTIONS = [$ENV{MSAN_OPTIONS}]") +string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}") +message("LOG_FILE=[${LOG_FILE}]") + +# if we are not asked to simulate address sanitizer don't do it +if(NOT "$ENV{MSAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") + return() +endif() +# clear the log file +file(REMOVE "${LOG_FILE}.2343") + +# create an error of each type of thread santizer +# these names come from tsan_report.cc in llvm + +file(APPEND "${LOG_FILE}.2343" +"================================================================= +==28423== WARNING: MemorySanitizer: use-of-uninitialized-value + #0 0x7f4364210dd9 in main (/home/kitware/msan/msan-bin/umr+0x7bdd9) + #1 0x7f4362d9376c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226 + #2 0x7f4364210b0c in _start (/home/kitware/msan/msan-bin/umr+0x7bb0c) + +SUMMARY: MemorySanitizer: use-of-uninitialized-value ??:0 main +Exiting +") diff --git a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake new file mode 100644 index 0000000..d591931 --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake @@ -0,0 +1,47 @@ +# this file simulates a program that has been built with thread sanitizer +# options + +message("TSAN_OPTIONS = [$ENV{TSAN_OPTIONS}]") +string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}") +message("LOG_FILE=[${LOG_FILE}]") + +set(error_types + "data race" + "data race on vptr (ctor/dtor vs virtual call)" + "heap-use-after-free" + "thread leak" + "destroy of a locked mutex" + "double lock of a mutex" + "unlock of an unlocked mutex (or by a wrong thread)" + "read lock of a write locked mutex" + "read unlock of a write locked mutex" + "signal-unsafe call inside of a signal" + "signal handler spoils errno" + "lock-order-inversion (potential deadlock)" + ) + +# clear the log file +file(REMOVE "${LOG_FILE}.2343") + +# create an error of each type of thread santizer +# these names come from tsan_report.cc in llvm +foreach(error_type ${error_types} ) + + file(APPEND "${LOG_FILE}.2343" +"================== +WARNING: ThreadSanitizer: ${error_type} (pid=27978) + Write of size 4 at 0x7fe017ce906c by thread T1: + #0 Thread1 ??:0 (exe+0x000000000bb0) + #1 :0 (libtsan.so.0+0x00000001b279) + + Previous write of size 4 at 0x7fe017ce906c by main thread: + #0 main ??:0 (exe+0x000000000c3c) + + Thread T1 (tid=27979, running) created by main thread at: + #0 :0 (libtsan.so.0+0x00000001ed7b) + #1 main ??:0 (exe+0x000000000c2c) + +SUMMARY: ThreadSanitizer: ${error_type} ??:0 Thread1 +================== +") +endforeach() diff --git a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake new file mode 100644 index 0000000..8ef3c0a --- /dev/null +++ b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake @@ -0,0 +1,21 @@ +# this file simulates a program that has been built with undefined behavior +# sanitizer options + +message("UBSAN_OPTIONS = [$ENV{UBSAN_OPTIONS}]") +string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}") +message("LOG_FILE=[${LOG_FILE}]") + +# if we are not asked to simulate address sanitizer don't do it +if(NOT "$ENV{UBSAN_OPTIONS}]" MATCHES "simulate_sanitizer.1") + return() +endif() +# clear the log file +file(REMOVE "${LOG_FILE}.2343") + +# create an error like undefined behavior santizer creates; +# these names come from ubsan_diag.cc and ubsan_handlers.cc +# in llvm + +file(APPEND "${LOG_FILE}.2343" +": runtime error: left shift of negative value -256 +") -- cgit v0.12 From b04c8ec3f840a5cb34a97b2fe8417882b49b3820 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2015 08:54:45 -0500 Subject: Tests: Match curl error in RunCMake.ctest_submit FailDrop-* cases Port the regexes over from the CTestTestFailedSubmit tests for ftp, http, and https. No such match is needed for the other protocols. --- Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt index 73df5c1..4345918 100644 --- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt +++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt @@ -1,3 +1,3 @@ -Error message was: .* +Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*) Problems when submitting via FTP Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt index c1a9126..9895181 100644 --- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt +++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt @@ -1,3 +1,3 @@ -Error message was: .* +Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*) Problems when submitting via HTTP Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt index 11db01a..a9c5d58 100644 --- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt +++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt @@ -1,3 +1,3 @@ -Error message was: .* +Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*) Problems when submitting via HTTP Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake -- cgit v0.12 From 57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2015 09:02:21 -0500 Subject: Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output When RunCMake tests run under dynamic analysis, Bullseye may add lines of the form "BullseyeCoverage..." to the output. Remove such lines from the actual output before matching it against the expected output. --- Tests/RunCMake/RunCMake.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 6389ef4..ffa1e2b 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -83,7 +83,7 @@ function(run_cmake test) endif() foreach(o out err) string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}") - string(REGEX REPLACE "(^|\n)(==[0-9]+==[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") + string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}") set(expect_${o} "") if(DEFINED expect_std${o}) -- cgit v0.12 From 69de0f7ea4163f350dd6683b6d7f47377157ae7d Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2015 09:05:22 -0500 Subject: Tests: Teach RunCMake to tolerate Guard Malloc lines in test output When RunCMake tests run under Xcode Guard Malloc, Guard Malloc may add lines of the form "() malloc:..." to the output. Remove such lines from the actual output before matching it against the expected output. --- Tests/RunCMake/RunCMake.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index ffa1e2b..3ad1bab 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -83,7 +83,7 @@ function(run_cmake test) endif() foreach(o out err) string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}") - string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") + string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}") set(expect_${o} "") if(DEFINED expect_std${o}) -- cgit v0.12 From 7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2015 09:12:47 -0500 Subject: Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output When RunCMake tests run on Solaris, the output may contain unexpected lines of the form "Error kstat returned...". These lines are printed by SystemInformationImplementation::RunProcess when called from SystemInformationImplementation::ParseValueFromKStat (see issue #12066). Until someone investigates why kstat returns values outside the range it documents, simply remove such lines from the actual output before matching it against the expected output. --- Tests/RunCMake/RunCMake.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 3ad1bab..abac66e 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -83,7 +83,7 @@ function(run_cmake test) endif() foreach(o out err) string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}") - string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") + string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}") set(expect_${o} "") if(DEFINED expect_std${o}) -- cgit v0.12 From e2b9e7f7bc1b4e3a36e8b19fc9925b358b5c99e0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2015 09:16:41 -0500 Subject: Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck The Dummy*-stderr.txt files were needed only to match platform-specific memcheck tooling output and verify that stderr is otherwise empty. Now that the RunCMake infrastructure knows how to strip such lines before matching, we can simply drop these files and use the default empty string match. --- Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt | 3 --- Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt | 3 --- Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt | 3 --- Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt | 3 --- Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt | 3 --- 5 files changed, 15 deletions(-) delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt deleted file mode 100644 index 14bc228..0000000 --- a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^((^| -)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^ -]*)*$ -- cgit v0.12