From 7eb875fe93328da3270fe18b2f3ecc2d55d50164 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 5 Sep 2017 09:00:04 -0400
Subject: [PATCH] Add a "Continuous Integration" track to cdash
---
scripts/circle/circle_el7-gcc48.cmake | 1 +
scripts/circle/circle_el7-gcc7-openmpi.cmake | 1 +
scripts/dashboard/common.cmake | 9 +++++++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/scripts/circle/circle_el7-gcc48.cmake b/scripts/circle/circle_el7-gcc48.cmake
index 8b131a668..3efe1284b 100644
--- a/scripts/circle/circle_el7-gcc48.cmake
+++ b/scripts/circle/circle_el7-gcc48.cmake
@@ -7,6 +7,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
set(dashboard_model Experimental)
set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}")
+set(dashboard_track "Continuous Integration")
set(CTEST_GIT_COMMAND "/usr/bin/git")
set(CTEST_UPDATE_VERSION_ONLY TRUE)
diff --git a/scripts/circle/circle_el7-gcc7-openmpi.cmake b/scripts/circle/circle_el7-gcc7-openmpi.cmake
index fb5c5a277..e337585db 100644
--- a/scripts/circle/circle_el7-gcc7-openmpi.cmake
+++ b/scripts/circle/circle_el7-gcc7-openmpi.cmake
@@ -7,6 +7,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
set(dashboard_model Experimental)
set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}")
+set(dashboard_track "Continuous Integration")
set(CTEST_GIT_COMMAND "/usr/bin/git")
set(CTEST_UPDATE_VERSION_ONLY TRUE)
diff --git a/scripts/dashboard/common.cmake b/scripts/dashboard/common.cmake
index 3cfd9584c..11b691153 100644
--- a/scripts/dashboard/common.cmake
+++ b/scripts/dashboard/common.cmake
@@ -31,6 +31,7 @@
# dashboard_source_name = Name of source directory (CMake)
# dashboard_binary_name = Name of binary directory (CMake-build)
# dashboard_cache = Initial CMakeCache.txt file content
+# dashboard_track = The name of the CDash "Track" to submit to
# dashboard_do_checkout = True to enable source checkout via git
# dashboard_do_update = True to enable the Update step
@@ -130,6 +131,7 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
message(FATAL_ERROR "dashboard_model must be Nightly or Experimental")
endif()
+
# Default to a Debug build.
if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
set(CTEST_BUILD_CONFIGURATION Debug)
@@ -359,18 +361,21 @@ if(dashboard_fresh)
endif()
# Start a new submission.
+if(dashboard_track)
+ set(dashboard_track_arg TRACK "${dashboard_track}")
+endif()
message("Calling ctest_start")
if(dashboard_fresh)
if(COMMAND dashboard_hook_start)
dashboard_hook_start()
endif()
- ctest_start(${dashboard_model})
+ ctest_start(${dashboard_model} ${dashboard_track_arg})
ctest_submit(PARTS Start)
if(COMMAND dashboard_hook_started)
dashboard_hook_started()
endif()
else()
- ctest_start(${dashboard_model} APPEND)
+ ctest_start(${dashboard_model} ${dashboard_track_arg} APPEND)
endif()
# Look for updates.
--
GitLab