From: Matthias Maier <tamiko@43-1.org>
Date: Fri, 5 Jul 2019 12:43:59 +0000 (-0500)
Subject: CMake: Update CTest configuration
X-Git-Tag: v9.2.0-rc1~1411^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8344%2Fhead;p=dealii.git

CMake: Update CTest configuration

 * Change server name to the new variant ctest.43-1.org

 * Use the CTEST_UPDATE mechanism instead of handwriting an Update.xml.
   This is necessary for cdash-2.6.0 support...
---

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 034e3820e0..ffaada9e65 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -20,10 +20,18 @@
 SET(CTEST_PROJECT_NAME "deal.II")
 
 SET(CTEST_DROP_METHOD "http")
-SET(CTEST_DROP_SITE "cdash.kyomu.43-1.org")
+SET(CTEST_DROP_SITE "cdash.43-1.org")
 SET(CTEST_DROP_LOCATION "/submit.php?project=deal.II")
 SET(CTEST_DROP_SITE_CDASH TRUE)
 
+#
+# We use the CTEST_UPDATE routine to query information about the repository
+# but we don't want to actually perform an update. Thus, replace the update
+# by a noop:
+#
+SET(CTEST_GIT_COMMAND "git")
+SET(CTEST_UPDATE_VERSION_ONLY true)
+
 SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS   100)
 SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 300)
 
diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake
index 688ae9da65..45ca1211af 100644
--- a/tests/run_testsuite.cmake
+++ b/tests/run_testsuite.cmake
@@ -504,6 +504,9 @@ ENDIF()
 
 CTEST_START(Experimental TRACK ${TRACK})
 
+MESSAGE("-- Running CTEST_UPDATE() to query git information")
+CTEST_UPDATE(SOURCE ${CTEST_SOURCE_DIRECTORY})
+
 MESSAGE("-- Running CTEST_CONFIGURE()")
 CTEST_CONFIGURE(OPTIONS "${_options}" RETURN_VALUE _res)
 
@@ -574,18 +577,6 @@ Unable to determine test submission files from TAG. Bailing out.
     )
 ENDIF()
 
-FILE(WRITE ${_path}/Update.xml
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<Update mode=\"Client\" Generator=\"ctest-${CTEST_VERSION}\">
-<Site>${CTEST_SITE}</Site>
-<BuildName>${CTEST_BUILD_NAME}</BuildName>
-<BuildStamp>${_tag}-${TRACK}</BuildStamp>
-<UpdateType>GIT</UpdateType>
-<Revision>${_git_WC_SHORTREV}</Revision>
-<Path>${_git_WC_BRANCH}</Path>
-</Update>"
-  )
-
 #
 # And finally submit:
 #