From 94dccdbf1e15801c4face6883226af2aa7f6bdb6 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 12 Aug 2014 23:18:17 +0200 Subject: [PATCH] Testsuite: Remove 'Nightly' Track, add 'Continuous' This commit removes the obsolete support for a 'Nightly' track and adds a new 'Continuous' track. The idea is that in future 'tester' uses exclusively the 'Regression Test' track and simserv04 uses 'Continuous'. Both testing sites have different strategies: tester goes through all commits with one configuration (for 32 and 64 bit indices), simserv04 just checks the latest merge available but for a number of compilers and configuration. The current mix of test results is just confusing and very horrible to read :-/ --- doc/developers/testsuite.html | 15 +++++++-------- tests/run_buildtest.cmake | 5 ++++- tests/run_testsuite.cmake | 25 ++++++++++++------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/doc/developers/testsuite.html b/doc/developers/testsuite.html index 281f157a51..3d681ac44a 100644 --- a/doc/developers/testsuite.html +++ b/doc/developers/testsuite.html @@ -820,18 +820,17 @@ TRACK - The track the test should be submitted to. Defaults to "Experimental". Possible values are: - "Experimental" - all tests that are not specifically "build" or - "regression" tests should go into this track + "Experimental" - all tests that are not specifically "build" tests + should go into this track - "Build Tests" - Build tests that configure and build in a - clean directory and run the build tests - "build_tests/*" - - "Nightly" - Reserved for nightly regression tests for - build bots on various architectures + "Build Tests" - Build tests that configure and build in a clean + directory and run exactly all build tests matching + "build_tests/.*" "Regression Tests" - Reserved for the regression tester + "Continuous" - Reserved for the regression tester + CONFIG_FILE - A configuration file (see docs/development/Config.sample) that will be used during the configuration stage (invokes diff --git a/tests/run_buildtest.cmake b/tests/run_buildtest.cmake index 98014f1de8..2b19c6a1c8 100644 --- a/tests/run_buildtest.cmake +++ b/tests/run_buildtest.cmake @@ -1,2 +1,5 @@ -SET(TRACK "Build Tests") +IF("${TRACK}" STREQUAL "") + SET(TRACK "Build Tests") +ENDIF() +SET(TEST_PICKUP_REGEX "^build_tests") INCLUDE(${CMAKE_CURRENT_LIST_DIR}/run_testsuite.cmake) diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake index 2344d100d9..f0995986d5 100644 --- a/tests/run_testsuite.cmake +++ b/tests/run_testsuite.cmake @@ -1,7 +1,7 @@ ## --------------------------------------------------------------------- ## $Id$ ## -## Copyright (C) 2013, 2014 by the deal.II authors +## Copyright (C) 2013 - 2014 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -35,7 +35,7 @@ # # # CTEST_SOURCE_DIRECTORY -# - The source directory of deal.II +# - The source directory of deal.II # - If unspecified, "../" relative to the location of this script is # used. If this is not a source directory, an error is thrown. # @@ -59,15 +59,14 @@ # "Experimental" - all tests that are not specifically "build" or # "regression" tests should go into this track # -# "Build Tests" - Build tests that configure and build in a -# clean directory and run the build tests -# "build_tests/*" -# -# "Nightly" - Reserved for nightly regression tests for -# build bots on various architectures +# "Build Tests" - Build tests that configure and build in a clean +# directory and run exactly all build tests matching +# "build_tests/.*" # # "Regression Tests" - Reserved for the "official" regression tester # +# "Continuous" - Reserved for the "official" regression tester +# # CONFIG_FILE # - A configuration file (see ../docs/development/Config.sample) # that will be used during the configuration stage (invokes @@ -109,8 +108,8 @@ ENDIF() IF( NOT "${TRACK}" STREQUAL "Experimental" AND NOT "${TRACK}" STREQUAL "Build Tests" - AND NOT "${TRACK}" STREQUAL "Nightly" - AND NOT "${TRACK}" STREQUAL "Regression Tests" ) + AND NOT "${TRACK}" STREQUAL "Regression Tests" + AND NOT "${TRACK}" STREQUAL "Continuous" ) MESSAGE(FATAL_ERROR " Unknown TRACK \"${TRACK}\" - see the manual for valid values. " @@ -240,11 +239,11 @@ ENDIF() MESSAGE("-- CTEST_SITE: ${CTEST_SITE}") -IF( "${TRACK}" STREQUAL "Regression Tests" +IF( TRACK MATCHES "^(Regression Tests|Continuous)$" AND NOT CTEST_SITE MATCHES "^(simserv04|tester)$" ) MESSAGE(FATAL_ERROR " I'm sorry ${CTEST_SITE}, I'm afraid I can't do that. -The TRACK \"Regression Tests\" is not for you. +The TRACK \"Regression Tests\" or \"Continuous\" is not for you. " ) ENDIF() @@ -582,4 +581,4 @@ IF("${_res}" STREQUAL "0") MESSAGE("-- Submission successful. Goodbye!") ENDIF() -# .oO( This script is freaky 585 lines long... ) +# .oO( This script is freaky 584 lines long... ) -- 2.39.5