add option to push to cdash

qgis · Feb 8, 2021 · ea8a707 · ea8a707
1 parent 54538eb
commit ea8a707
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -45,11 +45,14 @@ cmake \
  -DWITH_STAGED_PLUGINS=ON \
  -DWITH_GRASS=OFF \
  -DSUPPRESS_QT_WARNINGS=ON \
+ -DENABLE_TESTS=ON \
  -DENABLE_MODELTEST=ON \
  -DENABLE_PGTEST=ON \
  -DENABLE_SAGA_TESTS=ON \
  -DENABLE_MSSQLTEST=ON \
  -DENABLE_HANATEST=$HANA_TESTS_ENABLED \
+ -DENABLE_ORACLETEST=ON \
+ -DPUSH_TO_CDASH=${PUSH_TO_CDASH} \
  -DWITH_HANA=ON \
  -DWITH_QSPATIALITE=ON \
  -DWITH_QWTPOLAR=OFF \
@@ -59,7 +62,6 @@ cmake \
  -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
  -DWITH_ORACLE=ON \
- -DENABLE_ORACLETEST=ON \
  -DORACLE_INCLUDEDIR="/instantclient_19_9/sdk/include/" \
  -DORACLE_LIBDIR="/instantclient_19_9/" \
  -DDISABLE_DEPRECATED=ON \

diff --git a/.docker/docker-variables.env b/.docker/docker-variables.env
@@ -16,3 +16,5 @@ TRAVIS=true
 
 LANG=C.UTF-8
 LC_ALL=en_US.UTF-8
+
+PUSH_TO_CDASH=false
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -102,6 +102,7 @@ jobs:
                      -v $(pwd):/root/QGIS \
                      -v /home/runner/QGIS/.ccache:/root/.ccache \
                      --env-file .docker/docker-variables.env \
+                     --env PUSH_TO_CDASH=true \
                      qgis/qgis3-build-deps:${DOCKER_TAG} \
                      /root/QGIS/.docker/docker-qgis-build.sh
           docker commit qgis_container qgis_image

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -532,18 +532,19 @@ set(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML director
 # whether unit tests should be build
 set (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
 if (ENABLE_TESTS)
-set( QT_USE_QTTEST  TRUE )
-enable_testing()
-# Adds some testing specific build targets e.g. make Experimental
-include(Dart)
-# Additional test configuration options e.g. max upload size of test report
-configure_file(
-  "${CMAKE_SOURCE_DIR}/cmake_templates/CTestCustom.cmake.in"
-  "${CMAKE_BINARY_DIR}/CTestCustom.cmake"
-  IMMEDIATE @ONLY)
-# For server side testing we have no X, we can use xvfb as a fake x
-# sudo apt-get install xvfb
-add_custom_target(check COMMAND xvfb-run --server-args=-screen\ 0\ 1024x768x24 ctest --output-on-failure)
+  set (PUSH_TO_CDASH FALSE CACHE BOOL "Determines whether test results should be pushed to CDASH site")
+  set(QT_USE_QTTEST TRUE)
+  enable_testing()
+  # Adds some testing specific build targets e.g. make Experimental
+  include(Dart)
+  # Additional test configuration options e.g. max upload size of test report
+  configure_file(
+    "${CMAKE_SOURCE_DIR}/cmake_templates/CTestCustom.cmake.in"
+    "${CMAKE_BINARY_DIR}/CTestCustom.cmake"
+    IMMEDIATE @ONLY)
+  # For server side testing we have no X, we can use xvfb as a fake x
+  # sudo apt-get install xvfb
+  add_custom_target(check COMMAND xvfb-run --server-args=-screen\ 0\ 1024x768x24 ctest --output-on-failure)
 endif()
 
 if (WITH_CORE)
@@ -1048,6 +1049,7 @@ if (ENABLE_TESTS)
   add_subdirectory(tests)
   set (CTEST_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/bin" )
   message (STATUS "Ctest Binary Directory set to: ${CTEST_BINARY_DIRECTORY}")
+  message (STATUS "Ctest drop site: ${CTEST_DROP_SITE}")
 endif()
 
 #############################################################

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -7,7 +7,9 @@
 set(CTEST_PROJECT_NAME "QGIS")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
-set(CTEST_DROP_METHOD "https")
-set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=QGIS")
-set(CTEST_DROP_SITE_CDASH TRUE)
+if (PUSH_TO_CDASH)
+  set(CTEST_DROP_METHOD "https")
+  set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org")
+  set(CTEST_DROP_LOCATION "/submit.php?project=QGIS")
+  set(CTEST_DROP_SITE_CDASH TRUE)
+endif()