1
0
Эх сурвалжийг харах

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.
Brad King 16 жил өмнө
parent
commit
ed55b1b8d2

+ 0 - 12
Tests/CTestTest/CMakeLists.txt

@@ -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)

+ 0 - 13
Tests/CTestTest2/CMakeLists.txt

@@ -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)

+ 1 - 12
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)
-

+ 1 - 12
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)
-

+ 1 - 11
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)

+ 1 - 7
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)

+ 1 - 12
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=$<TARGET_FILE: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)