Browse Source

Merge topic 'ctest-nightly-start-time'

4f2fa2459a Tests: Add tests to demonstrate when CTEST_NIGHTLY_START_TIME is needed
c1397ace1d Help: Clarify why CTEST_NIGHTLY_START_TIME is needed

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4688
Brad King 5 years ago
parent
commit
d1d1d4134d

+ 6 - 2
Help/variable/CTEST_NIGHTLY_START_TIME.rst

@@ -1,5 +1,9 @@
 CTEST_NIGHTLY_START_TIME
 ------------------------
 
-Specify the CTest ``NightlyStartTime`` setting
-in a :manual:`ctest(1)` dashboard client script.
+Specify the CTest ``NightlyStartTime`` setting in a :manual:`ctest(1)`
+dashboard client script.
+
+Note that this variable must always be set for a nightly build in a
+dashboard script. It is needed so that nightly builds can be properly grouped
+together in CDash.

+ 1 - 0
Tests/RunCMake/ctest_start/NoStartTimeNightly-result.txt

@@ -0,0 +1 @@
+(-1|255)

+ 4 - 0
Tests/RunCMake/ctest_start/NoStartTimeNightly-stderr.txt

@@ -0,0 +1,4 @@
+^WARNING: No nightly start time found please set in CTestConfig\.cmake or DartConfig\.cmake
+CMake Error at [^
+]*/Tests/RunCMake/ctest_start/NoStartTimeNightly/test\.cmake:[0-9]+ \(ctest_start\):
+  ctest_start unknown error\.$

+ 2 - 0
Tests/RunCMake/ctest_start/RunCMakeTest.cmake

@@ -48,6 +48,8 @@ run_ctest_start(TooManyArgs Experimental
                 ${RunCMake_BINARY_DIR}/TooManyArgs-build
                 ${RunCMake_BINARY_DIR}/TooManyArgs-build
                 ${RunCMake_BINARY_DIR}/TooManyArgs-build)
+run_ctest_start(NoStartTimeExperimental Experimental)
+run_ctest_start(NoStartTimeNightly Nightly)
 
 function(run_ConfigInBuild)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ConfigInBuild-build)

+ 3 - 1
Tests/RunCMake/ctest_start/test.cmake.in

@@ -8,7 +8,9 @@ set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
 set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
 set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
 set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-set(CTEST_NIGHTLY_START_TIME            "01:00:00 UTC")
+if(NOT "@CASE_NAME@" MATCHES "^NoStartTime")
+  set(CTEST_NIGHTLY_START_TIME            "01:00:00 UTC")
+endif()
 
 function(setup_tests)
   ctest_start(${ctest_start_args})