ENH: If dart or ctest are not found, use ctest. For default drop location etc, support http submit (just set DROP_METHOD to http. Only look for tclsh if DART_ROOT is set
This commit is contained in:
parent
9fd8d5f181
commit
a4c8aee1f4
|
@ -11,6 +11,8 @@
|
|||
OPTION(BUILD_TESTING "Build the testing tree." "On")
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
ENABLE_TESTING()
|
||||
|
||||
INCLUDE(${CMAKE_ROOT}/Modules/FindDart.cmake)
|
||||
|
||||
#
|
||||
|
@ -29,11 +31,20 @@ IF(BUILD_TESTING)
|
|||
SET (NIGHTLY_START_TIME "00:00:00 EDT")
|
||||
|
||||
# Dart server to submit results (used by client)
|
||||
# There should be an option to specify submit method, but I will leave it
|
||||
# commented until we decide what to do with it.
|
||||
# SET(DROP_METHOD "http" CACHE STRING "Set the CTest submit method. Valid options are http and ftp")
|
||||
IF(DROP_METHOD MATCHES http)
|
||||
SET (DROP_SITE "public.kitware.com")
|
||||
SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi")
|
||||
ELSE(DROP_METHOD MATCHES http)
|
||||
SET (DROP_SITE "public.kitware.com")
|
||||
SET (DROP_LOCATION "/incoming")
|
||||
SET (DROP_SITE_USER "anonymous")
|
||||
SET (DROP_SITE_PASSWORD "random@ringworld")
|
||||
SET (DROP_SITE_MODE "active")
|
||||
ENDIF(DROP_METHOD MATCHES http)
|
||||
|
||||
SET (TRIGGER_SITE "http://${DROP_SITE}/cgi-bin/Submit-Random-TestingResults.pl")
|
||||
|
||||
# Project Home Page
|
||||
|
@ -79,9 +90,6 @@ IF(BUILD_TESTING)
|
|||
FIND_PROGRAM(SCPCOMMAND scp DOC "Path to scp command, used by some Dart clients for submitting results to a Dart server (when not using ftp for submissions)")
|
||||
FIND_PROGRAM(COVERAGE_COMMAND gcov DOC "Path to the coverage program that Dart client uses for performing coverage inspection")
|
||||
|
||||
# find a tcl shell command
|
||||
INCLUDE(${CMAKE_ROOT}/Modules/FindTclsh.cmake)
|
||||
|
||||
# set the site name
|
||||
SITE_NAME(SITE)
|
||||
# set the build name
|
||||
|
@ -153,8 +161,13 @@ IF(BUILD_TESTING)
|
|||
#
|
||||
# Make necessary directories and configure testing scripts
|
||||
#
|
||||
# find a tcl shell command
|
||||
IF(DART_ROOT)
|
||||
INCLUDE(${CMAKE_ROOT}/Modules/FindTclsh.cmake)
|
||||
ENDIF(DART_ROOT)
|
||||
|
||||
IF (DART_ROOT)
|
||||
|
||||
IF (DART_ROOT AND TCL_TCLSH)
|
||||
# make directories in the binary tree
|
||||
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Dashboard
|
||||
${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Sites/${SITE}/${BUILDNAME})
|
||||
|
@ -172,7 +185,6 @@ IF(BUILD_TESTING)
|
|||
#
|
||||
|
||||
# add testing targets
|
||||
IF(TCL_TCLSH)
|
||||
SET(DART_EXPERIMENTAL_NAME Experimental)
|
||||
IF(DART_EXPERIMENTAL_USE_PROJECT_NAME)
|
||||
SET(DART_EXPERIMENTAL_NAME "${DART_EXPERIMENTAL_NAME}${PROJECT_NAME}")
|
||||
|
@ -244,12 +256,7 @@ IF(BUILD_TESTING)
|
|||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly DashboardEnd)
|
||||
ENDIF (${CMAKE_MAKE_PROGRAM} MATCHES make)
|
||||
|
||||
ELSE(TCL_TCLSH)
|
||||
MESSAGE("Could not find TCL_TCLSH, disabling testing." "Error")
|
||||
ENDIF(TCL_TCLSH)
|
||||
ENABLE_TESTING()
|
||||
|
||||
ELSE(DART_ROOT)
|
||||
ELSE(DART_ROOT AND TCL_TCLSH)
|
||||
# make directories in the binary tree
|
||||
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/Temporary)
|
||||
GET_FILENAME_COMPONENT(CMAKE_HOST_PATH ${CMAKE_COMMAND} PATH)
|
||||
|
@ -298,7 +305,7 @@ IF(BUILD_TESTING)
|
|||
ENDFOREACH(testtype)
|
||||
ENDFOREACH(mode)
|
||||
ENDIF (${CMAKE_MAKE_PROGRAM} MATCHES make)
|
||||
ENDIF (DART_ROOT)
|
||||
ENDIF (DART_ROOT AND TCL_TCLSH)
|
||||
ENDIF(BUILD_TESTING)
|
||||
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue