Modules/CTest: Set SubmitURL

This commit is contained in:
Regina Pfeifer 2018-12-08 00:01:20 +01:00 committed by Brad King
parent 938f06fda6
commit d6475daa79
2 changed files with 14 additions and 6 deletions

View File

@ -89,6 +89,7 @@ if(BUILD_TESTING)
if(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake")
include("${PROJECT_SOURCE_DIR}/CTestConfig.cmake")
SET_IF_SET_AND_NOT_SET(NIGHTLY_START_TIME "${CTEST_NIGHTLY_START_TIME}")
SET_IF_SET_AND_NOT_SET(SUBMIT_URL "${CTEST_SUBMIT_URL}")
SET_IF_SET_AND_NOT_SET(DROP_METHOD "${CTEST_DROP_METHOD}")
SET_IF_SET_AND_NOT_SET(DROP_SITE "${CTEST_DROP_SITE}")
SET_IF_SET_AND_NOT_SET(DROP_SITE_USER "${CTEST_DROP_SITE_USER}")
@ -111,6 +112,18 @@ if(BUILD_TESTING)
endif()
SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")
if(NOT SUBMIT_URL)
set(SUBMIT_URL "${DROP_METHOD}://")
if(DROP_SITE_USER)
string(APPEND SUBMIT_URL "${DROP_SITE_USER}")
if(DROP_SITE_PASSWORD)
string(APPEND SUBMIT_URL ":${DROP_SITE_PASSWORD}")
endif()
string(APPEND SUBMIT_URL "@")
endif()
string(APPEND SUBMIT_URL "${DROP_SITE}${DROP_SITE_LOCATION}")
endif()
find_program(CVSCOMMAND cvs )
set(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING
"Options passed to the cvs update command.")

View File

@ -20,12 +20,7 @@ BuildName: @BUILDNAME@
LabelsForSubprojects: @CTEST_LABELS_FOR_SUBPROJECTS@
# Submission information
DropSite: @DROP_SITE@
DropLocation: @DROP_LOCATION@
DropSiteUser: @DROP_SITE_USER@
DropSitePassword: @DROP_SITE_PASSWORD@
DropSiteMode: @DROP_SITE_MODE@
DropMethod: @DROP_METHOD@
SubmitURL: @SUBMIT_URL@
# Dashboard start time
NightlyStartTime: @NIGHTLY_START_TIME@