From ed55b1b8d217a943a4c5b6d332e32d7d8913a49e Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Dec 2009 09:16:29 -0500 Subject: [PATCH] Remove unused code from CTest test suite We remove from Tests/CTestTest*/CMakeLists.txt some historical cruft that is no longer used by the test suite. --- Tests/CTestTest/CMakeLists.txt | 12 ------------ Tests/CTestTest2/CMakeLists.txt | 13 ------------- Tests/CTestTestCrash/CMakeLists.txt | 13 +------------ Tests/CTestTestFailure/CMakeLists.txt | 13 +------------ Tests/CTestTestParallel/CMakeLists.txt | 12 +----------- Tests/CTestTestSubdir/CMakeLists.txt | 8 +------- Tests/CTestTestTimeout/CMakeLists.txt | 13 +------------ 7 files changed, 5 insertions(+), 79 deletions(-) delete mode 100644 Tests/CTestTest/CMakeLists.txt delete mode 100644 Tests/CTestTest2/CMakeLists.txt diff --git a/Tests/CTestTest/CMakeLists.txt b/Tests/CTestTest/CMakeLists.txt deleted file mode 100644 index 7d8761238..000000000 --- a/Tests/CTestTest/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -PROJECT(CTestTest) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") - -CONFIGURE_FILE(${CTestTest_SOURCE_DIR}/test.cmake.in - ${CTestTest_BINARY_DIR}/test.cmake @ONLY) diff --git a/Tests/CTestTest2/CMakeLists.txt b/Tests/CTestTest2/CMakeLists.txt deleted file mode 100644 index ec793c418..000000000 --- a/Tests/CTestTest2/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -PROJECT(CTestTest2) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") - - -CONFIGURE_FILE(${CTestTest2_SOURCE_DIR}/test.cmake.in - ${CTestTest2_BINARY_DIR}/test.cmake @ONLY) diff --git a/Tests/CTestTestCrash/CMakeLists.txt b/Tests/CTestTestCrash/CMakeLists.txt index 5c8cc0b3a..669be526d 100644 --- a/Tests/CTestTestCrash/CMakeLists.txt +++ b/Tests/CTestTestCrash/CMakeLists.txt @@ -1,19 +1,8 @@ cmake_minimum_required (VERSION 2.6) PROJECT(CTestTestCrash) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") +INCLUDE(CTest) ADD_EXECUTABLE (Crash crash.cxx) TARGET_LINK_LIBRARIES (NoBuild ${EXTRA_LIBS}) -ENABLE_TESTING () - ADD_TEST (TestCrash Crash) - -INCLUDE (CTest) - diff --git a/Tests/CTestTestFailure/CMakeLists.txt b/Tests/CTestTestFailure/CMakeLists.txt index 62ce7c542..690fbfc5c 100644 --- a/Tests/CTestTestFailure/CMakeLists.txt +++ b/Tests/CTestTestFailure/CMakeLists.txt @@ -1,19 +1,8 @@ cmake_minimum_required (VERSION 2.6) PROJECT(CTestTestFailure) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") +INCLUDE(CTest) ADD_EXECUTABLE (NoBuild badCode.cxx) TARGET_LINK_LIBRARIES (NoBuild ${EXTRA_LIBS}) -ENABLE_TESTING () - ADD_TEST (TestNoExe NoBuild) - -INCLUDE (CTest) - diff --git a/Tests/CTestTestParallel/CMakeLists.txt b/Tests/CTestTestParallel/CMakeLists.txt index 1e57074d5..8fab44b45 100644 --- a/Tests/CTestTestParallel/CMakeLists.txt +++ b/Tests/CTestTestParallel/CMakeLists.txt @@ -1,17 +1,9 @@ cmake_minimum_required (VERSION 2.6) PROJECT(CTestTestParallel) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") +INCLUDE(CTest) ADD_EXECUTABLE (LockFile lockFile.c) -ENABLE_TESTING () - ADD_TEST (TestRunSerial1 LockFile) ADD_TEST (TestRunSerial2 LockFile) SET_TESTS_PROPERTIES(TestRunSerial1 TestRunSerial2 PROPERTIES RUN_SERIAL true) @@ -19,5 +11,3 @@ SET_TESTS_PROPERTIES(TestRunSerial1 TestRunSerial2 PROPERTIES RUN_SERIAL true) ADD_TEST (TestProcessorsGreaterThanMPL1 LockFile) ADD_TEST (TestProcessorsGreaterThanMPL2 LockFile) SET_TESTS_PROPERTIES(TestProcessorsGreaterThanMPL1 PROPERTIES PROCESSORS 10) - -INCLUDE (CTest) diff --git a/Tests/CTestTestSubdir/CMakeLists.txt b/Tests/CTestTestSubdir/CMakeLists.txt index 5daa543a3..5400ee8c5 100644 --- a/Tests/CTestTestSubdir/CMakeLists.txt +++ b/Tests/CTestTestSubdir/CMakeLists.txt @@ -1,12 +1,6 @@ cmake_minimum_required (VERSION 2.6) PROJECT(CTestTestSubdir) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") +INCLUDE(CTest) ADD_SUBDIRECTORY(subdir) SUBDIRS(subdir2) diff --git a/Tests/CTestTestTimeout/CMakeLists.txt b/Tests/CTestTestTimeout/CMakeLists.txt index ed7f1751b..5fce68093 100644 --- a/Tests/CTestTestTimeout/CMakeLists.txt +++ b/Tests/CTestTestTimeout/CMakeLists.txt @@ -1,17 +1,9 @@ cmake_minimum_required (VERSION 2.8) PROJECT(CTestTestTimeout) - -SET(DART_ROOT "" CACHE STRING "" FORCE) -ENABLE_TESTING() -INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") +INCLUDE(CTest) ADD_EXECUTABLE (Timeout timeout.c) -ENABLE_TESTING () - ADD_TEST(NAME TestTimeout COMMAND ${CMAKE_COMMAND} -D Timeout=$ -D Log=${CMAKE_CURRENT_BINARY_DIR}/timeout.log @@ -25,6 +17,3 @@ ADD_TEST(NAME CheckChild -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake ) SET_TESTS_PROPERTIES(CheckChild PROPERTIES DEPENDS TestTimeout) - - -INCLUDE (CTest)