Просмотр исходного кода

Tests: Eliminate unnecessary files and variables.

1: The CTestTestFailedSubmits tests do not need to run the
   CTEST_MEMCHECK command. It is covered by the CTestTest2
   test. If more coverage *is* required, choose a test that
   runs by itself once to add it to... This one gets used
   several times in a loop to test submission failure via
   the various submission protocols. With memchecking on,
   each test here takes 1000 seconds or more on a "fast"
   build...

2: Other ctest tests do not need any of the CTEST_MEMORYCHECK_*
   variables defined. They don't even call CTEST_MEMCHECK, or
   -D NightlyMemCheck, or anything. So: remove the unnecessary
   set calls.

3: CTestTest3 has gone intentionally unused for months because
   it did not add any coverage and caused no ends of sporadic
   randomish failures when network connectivity was spotty.
   Remove its directory. Never add it again.
David Cole 15 лет назад
Родитель
Сommit
a6a21c85ed

+ 0 - 120
Tests/CTestTest3/test.cmake.in

@@ -1,120 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.1)
-
-MACRO(PROJECT_START NAME)
-  MESSAGE("###################################################")
-  MESSAGE("")
-  MESSAGE("Start project: ${NAME}")
-  MESSAGE("")
-  MESSAGE("###################################################")
-ENDMACRO(PROJECT_START)
-
-# Project 1
-PROJECT_START("KWSys from CVS")
-
-# Settings:
-SET(CTEST_DASHBOARD_ROOT                "@CMake_BINARY_DIR@/Tests/CTestTest3")
-SET(CTEST_SITE                          "@SITE@")
-SET(CTEST_BUILD_NAME                    "KWSys-@BUILDNAME@-CTest3-CVS")
-
-# ---
-SET(CTEST_SOURCE_DIRECTORY              "${CTEST_DASHBOARD_ROOT}/CVS/KWSys")
-SET(CTEST_BINARY_DIRECTORY              "${CTEST_DASHBOARD_ROOT}/CVS/KWSysBin")
-SET(CTEST_UPDATE_COMMAND                "@CVSCOMMAND@")
-SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
-SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
-# for unix purify has to be used as a linker, and
-# will not work with ctest.  So disable it so
-# that it is not attempted.
-IF(UNIX)
-  IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify)
-    SET(CTEST_MEMORYCHECK_COMMAND)
-  ENDIF()
-ENDIF()
-SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
-SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-SET(CTEST_CHECKOUT_COMMAND              "\"${CTEST_UPDATE_COMMAND}\" -q -z3 \"-d:pserver:[email protected]:/cvsroot/KWSys\" co -r CTest-Testing-Tag KWSys")
-
-CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
-
-FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
-CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
-CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
-CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
-CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
-CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
-CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
-
-# This one is needed for testing advanced ctest features
-CTEST_TEST_KWSYS:BOOL=ON
-")
-
-SET(CTEST_CUSTOM_WARNING_MATCH CommandLineArguments)
-
-CTEST_START(Nightly)
-CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
-CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_READ_CUSTOM_FILES("${CTEST_BINARY_DIRECTORY}")
-CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res PARALLEL_LEVEL 5 SCHEDULE_RANDOM ON)
-CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-
-set(CTEST_DROP_METHOD "@protocol@")
-set(CTEST_DROP_SITE "@server@")
-set(CTEST_DROP_LOCATION "@path@/submit.php?project=PublicDashboard")
-
-CTEST_SUBMIT(RETURN_VALUE res)
-
-#SET(svncommand "@SVNCOMMAND@")
-set(svncommand FALSE) # turn this off until namic svn cmake is back
-IF(svncommand)
-  # Project 2
-  PROJECT_START("KWSys from SVN")
-
-  # Settings:
-  SET(CTEST_DASHBOARD_ROOT                "@CMake_BINARY_DIR@/Tests/CTestTest3")
-  SET(CTEST_SITE                          "@SITE@")
-  SET(CTEST_BUILD_NAME                    "KWSys-@BUILDNAME@-CTest3-SVN")
-
-  # ---
-  SET(CTEST_SOURCE_DIRECTORY              "${CTEST_DASHBOARD_ROOT}/SVN/kwsys")
-  SET(CTEST_BINARY_DIRECTORY              "${CTEST_DASHBOARD_ROOT}/SVN/kwsysBin")
-  SET(CTEST_UPDATE_COMMAND                "@SVNCOMMAND@")
-  SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
-  SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-  SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-  SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-  SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
-  SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
-  SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-  SET(CTEST_CHECKOUT_COMMAND              "\"${CTEST_UPDATE_COMMAND}\" co \"http://svn.na-mic.org:8000/svn/CMake/Source/kwsys/\" -r 500")
-
-  CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
-
-  FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
-  CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
-  CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
-  CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
-  CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
-  CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
-  CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
-
-  # This one is needed for testing advanced ctest features
-  CTEST_TEST_KWSYS:BOOL=ON
-  ")
-
-  CTEST_START(Experimental)
-  CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
-  CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-  CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-  CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res PARALLEL_LEVEL 5 SCHEDULE_RANDOM ON)
-  CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res PARALLEL_LEVEL 5)
-  CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-  CTEST_SUBMIT(RETURN_VALUE res)
-
-ELSE(svncommand)
-  MESSAGE("Cannot find SVN command: ${svncommand}")
-ENDIF(svncommand)

+ 0 - 3
Tests/CTestTestBadExe/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestBadEx
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestChecksum/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestParal
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestCostSerial/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestCostS
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestCrash/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestCrash
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestCycle/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestCycle
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestDepends/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestDepen
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 4
Tests/CTestTestFailedSubmits/test.cmake.in

@@ -22,9 +22,6 @@ SET(CTEST_BINARY_DIRECTORY              "@build@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 
@@ -39,7 +36,6 @@ CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}"
   RETURN_VALUE res)
   RETURN_VALUE res)
 CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 CTEST_TEST(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)
 CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" @ctest_coverage_labels_args@ RETURN_VALUE res)
 CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" @ctest_coverage_labels_args@ RETURN_VALUE res)
 
 
 # ok to call ctest_submit - still avoids network activity because there is
 # ok to call ctest_submit - still avoids network activity because there is

+ 0 - 3
Tests/CTestTestFailure/testNoBuild.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestFailu
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestFailure/testNoExe.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestFailu
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestParallel/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestParal
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestResourceLock/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestResou
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestScheduler/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestSched
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestStopTime/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestStopT
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestSubdir/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestSubdi
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestTimeout/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestTimeo
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 
 

+ 0 - 3
Tests/CTestTestZeroTimeout/test.cmake.in

@@ -10,9 +10,6 @@ SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestZeroT
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
-SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
-SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_TEST_TIMEOUT                  2)
 SET(CTEST_TEST_TIMEOUT                  2)