diff --git a/scripts/circle/circle_el7-gcc48.cmake b/scripts/circle/circle_el7-gcc48.cmake index 8b131a668b50dc188dc21fc2049095331609e053..3efe1284b1c499b506ae2ef7ac508739ccd4796d 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 fb5c5a2775f2b322fdc72e766e146449da835c6d..e337585db7bcb3bdea6e3c3fba1ff666b696b173 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 3cfd9584cc6cb62a84bfea134bce3f8705e3a193..11b691153089ee7334b704b68ddbbe9d0d24683c 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.