ENH: use ctest to drive dashboards for make targets as opposed to tclsh
This commit is contained in:
Ken Martin
parent
82d8264b9f
commit
934949edd0
@ -75,7 +75,7 @@ IF(BUILD_TESTING)
|
|||||||
ENDIF(HAVE_DART)
|
ENDIF(HAVE_DART)
|
||||||
|
|
||||||
|
|
||||||
IF (HAVE_DART AND TCL_TCLSH)
|
IF (HAVE_DART)
|
||||||
# make directories in the binary tree
|
# make directories in the binary tree
|
||||||
FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Dashboard"
|
FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Dashboard"
|
||||||
"${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Sites/${SITE}/${BUILDNAME}")
|
"${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Sites/${SITE}/${BUILDNAME}")
|
||||||
@ -97,78 +97,11 @@ IF(BUILD_TESTING)
|
|||||||
IF(DART_EXPERIMENTAL_USE_PROJECT_NAME)
|
IF(DART_EXPERIMENTAL_USE_PROJECT_NAME)
|
||||||
SET(DART_EXPERIMENTAL_NAME "${DART_EXPERIMENTAL_NAME}${PROJECT_NAME}")
|
SET(DART_EXPERIMENTAL_NAME "${DART_EXPERIMENTAL_NAME}${PROJECT_NAME}")
|
||||||
ENDIF(DART_EXPERIMENTAL_USE_PROJECT_NAME)
|
ENDIF(DART_EXPERIMENTAL_USE_PROJECT_NAME)
|
||||||
ADD_CUSTOM_TARGET(${DART_EXPERIMENTAL_NAME}
|
ENDIF (HAVE_DART)
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Start Update Configure Build Test)
|
|
||||||
ADD_CUSTOM_TARGET(${DART_EXPERIMENTAL_NAME}Submit
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Submit)
|
|
||||||
|
|
||||||
# for non IDE based builds nmake and make
|
SET(RUN_FROM_CTEST_OR_DART 1)
|
||||||
# add all these extra targets
|
INCLUDE(CTestTargets)
|
||||||
IF(${CMAKE_MAKE_PROGRAM} MATCHES make)
|
SET(RUN_FROM_CTEST_OR_DART)
|
||||||
# Make targets for Experimental builds
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalStart
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Start)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalUpdate
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Start Update)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalConfigure
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Start Configure)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalBuild
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Start Build)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalTest
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Test)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalCoverage
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental Coverage)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalDashboardStart
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental DashboardStart)
|
|
||||||
ADD_CUSTOM_TARGET(ExperimentalDashboardEnd
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Experimental DashboardEnd)
|
|
||||||
|
|
||||||
# Continuous
|
|
||||||
ADD_CUSTOM_TARGET(Continuous
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Start Update Configure Build Test Submit)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousStart
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Start)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousUpdate
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Update)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousConfigure
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Configure)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousBuild
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Build)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousTest
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Test)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousCoverage
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Coverage)
|
|
||||||
ADD_CUSTOM_TARGET(ContinuousSubmit
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Continuous Submit)
|
|
||||||
|
|
||||||
# Nightly
|
|
||||||
ADD_CUSTOM_TARGET(Nightly
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Start Update Configure Build Test Submit)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyStart
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Start)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyUpdate
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Update)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyConfigure
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Configure)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyBuild
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Build)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyTest
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Test)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyCoverage
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Coverage)
|
|
||||||
ADD_CUSTOM_TARGET(NightlySubmit
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly Submit)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyDashboardStart
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly DashboardStart)
|
|
||||||
ADD_CUSTOM_TARGET(NightlyDashboardEnd
|
|
||||||
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly DashboardEnd)
|
|
||||||
ENDIF (${CMAKE_MAKE_PROGRAM} MATCHES make)
|
|
||||||
|
|
||||||
ELSE(HAVE_DART AND TCL_TCLSH)
|
|
||||||
SET(RUN_FROM_CTEST_OR_DART 1)
|
|
||||||
INCLUDE(CTestTargets)
|
|
||||||
SET(RUN_FROM_CTEST_OR_DART)
|
|
||||||
ENDIF (HAVE_DART AND TCL_TCLSH)
|
|
||||||
ENDIF(BUILD_TESTING)
|
ENDIF(BUILD_TESTING)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user