From: Matthias Maier Date: Wed, 18 Sep 2013 15:44:55 +0000 (+0000) Subject: Beta version *yay* X-Git-Tag: v8.1.0~570^2~288 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ab4a1dd151824f77455fc85ce540d0b6e47995;p=dealii.git Beta version *yay* git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30800 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CTestConfig.cmake b/deal.II/CTestConfig.cmake index cdba0392fa..b76fa0f08d 100644 --- a/deal.II/CTestConfig.cmake +++ b/deal.II/CTestConfig.cmake @@ -21,11 +21,18 @@ # # ######################################################################## +# +# Dashboard configuration: +# + SET(CTEST_PROJECT_NAME "deal.II") SET(CTEST_NIGHTLY_START_TIME "1:00:00 UTC") -# TODO Drop method +SET(CTEST_DROP_METHOD "http") +SET(CTEST_DROP_SITE "my.cdash.org") +SET(CTEST_DROP_LOCATION "/submit.php?project=deal.II") +SET(CTEST_DROP_SITE_CDASH TRUE) # # Coverage options: diff --git a/deal.II/run_testsuite.cmake b/deal.II/run_testsuite.cmake index 900c705fc8..8b77faf331 100644 --- a/deal.II/run_testsuite.cmake +++ b/deal.II/run_testsuite.cmake @@ -118,9 +118,9 @@ MESSAGE("-- DEAL_II_NO_JOBS: ${DEAL_II_NO_JOBS}") # Finalize: # -SET(CMAKE_EXTRA_SUBMIT_FILES +SET(CTEST_NOTES_FILES + ${CTEST_BINARY_DIRECTORY}/summary.log ${CTEST_BINARY_DIRECTORY}/detailed.log - # TODO ) @@ -143,23 +143,23 @@ IF("${TRACK}" STREQUAL "Experimental") # - No cleanup is done prior to test run # + CTEST_START(Experimental TRACK Experimental) + IF(NOT "${DEAL_II_CONFIG_FILE}" STREQUAL "") + CTEST_CONFIGURE(OPTIONS -C"${DEAL_II_CONFIG_FILE}") + ELSE() + CTEST_CONFIGURE() + ENDIF() - CTEST_START(Experimental TRACK Experimental) - CTEST_CONFIGURE() # just reconfigure (without any options) CTEST_BUILD(TARGET setup_test) # setup tests CTEST_BUILD(TARGET) # builds the "all" target + CTEST_TEST(PARALLEL_LEVEL ${DEAL_II_NO_JOBS}) - #CTEST_SUBMIT() + + CTEST_SUBMIT() ELSE() MESSAGE(FATAL_ERROR "TRACK has to be set TODO") ENDIF() - -#IF(NOT "${DEAL_II_CONFIG_FILE}" STREQUAL "") -# CTEST_CONFIGURE(OPTIONS -C"${DEAL_II_CONFIG_FILE}") -#ELSE() -# CTEST_CONFIGURE() -#ENDIF()