From: maier Date: Wed, 18 Sep 2013 17:51:47 +0000 (+0000) Subject: Last bits for today X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=760c5a33d490b069afcbf51a7b62c799fa2189c3;p=dealii-svn.git Last bits for today git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30806 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CTestConfig.cmake b/deal.II/CTestConfig.cmake index b3011827b6..b6ef110194 100644 --- a/deal.II/CTestConfig.cmake +++ b/deal.II/CTestConfig.cmake @@ -14,13 +14,6 @@ ## ## --------------------------------------------------------------------- - -######################################################################## -# # -# General configuration: # -# # -######################################################################## - # # Dashboard configuration: # diff --git a/deal.II/run_testsuite.cmake b/deal.II/run_testsuite.cmake index 961a121985..e8b53a1dbe 100644 --- a/deal.II/run_testsuite.cmake +++ b/deal.II/run_testsuite.cmake @@ -20,6 +20,8 @@ # # ######################################################################## +# +# Configuration options: # # CTEST_SOURCE_DIRECTORY # CTEST_BINARY_DIRECTORY @@ -114,7 +116,6 @@ ENDIF() MESSAGE("-- NO_JOBS: ${NO_JOBS}") - # # CTEST_SITE: # @@ -140,7 +141,7 @@ SET(CTEST_BUILD_NAME "${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}" ) -# Append compiler information: +# Append compiler information if available... IF(EXISTS ${CTEST_BINARY_DIRECTORY}/detailed.log) FILE(STRINGS ${CTEST_BINARY_DIRECTORY}/detailed.log _compiler_id REGEX "CMAKE_CXX_COMPILER:" @@ -169,18 +170,17 @@ IF(NOT TRACK MATCHES "Foobar") #TODO: Exclude Continuous TRACKS ENDIF() ENDIF() - # # Finalize: # SET(CTEST_NOTES_FILES + ${CTEST_BINARY_DIRECTORY}/revision.log ${CTEST_BINARY_DIRECTORY}/summary.log ${CTEST_BINARY_DIRECTORY}/detailed.log ) - ######################################################################## # # # Run the testsuite: # @@ -197,16 +197,11 @@ IF("${TRACK}" STREQUAL "Experimental") # - Run the configure, build and test stages and submit the results to # the "Experimental" track # - # - No cleanup is done prior to test run + # - No cleanup is done # CTEST_START(Experimental TRACK Experimental) - # quick test: - #IF(NOT "${CTEST_UPDATE_COMMAND}" STREQUAL "") - # CTEST_UPDATE() - #ENDIF() - IF(NOT "${CONFIG_FILE}" STREQUAL "") CTEST_CONFIGURE(OPTIONS -C"${CONFIG_FILE}") ELSE()