The CTestTestMemcheck test cases all try to check the ctest output with a regular expression. They fail intermittently due to ordering of the portions of the output that come from stdout and stderr being mixed. Convert all the test cases to use the RunCMake infrastructure to match stdout and stderr separately.
25 lines
1.1 KiB
CMake
25 lines
1.1 KiB
CMake
cmake_minimum_required(VERSION 2.8.9)
|
|
|
|
# Settings:
|
|
set(CTEST_SITE "@SITE@")
|
|
set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@SUBTEST_NAME@")
|
|
|
|
set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@")
|
|
set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_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)
|