Skip to content
Permalink
Browse files

fix pushing to CDash

  • Loading branch information
3nids authored and nyalldawson committed Feb 8, 2021
1 parent 19b4b1a commit c2f4c8edee2606fbf8386006e9400c8f9b5f6222
Showing with 10 additions and 7 deletions.
  1. +6 −1 CMakeLists.txt
  2. +4 −6 CTestConfig.cmake → cmake_templates/CTestConfig.cmake.in
@@ -542,6 +542,12 @@ if (ENABLE_TESTS)
"${CMAKE_SOURCE_DIR}/cmake_templates/CTestCustom.cmake.in"
"${CMAKE_BINARY_DIR}/CTestCustom.cmake"
IMMEDIATE @ONLY)
if (PUSH_TO_CDASH)
configure_file(
"${CMAKE_SOURCE_DIR}/cmake_templates/CTestConfig.cmake.in"
"${CMAKE_BINARY_DIR}/CTestConfig.cmake"
IMMEDIATE @ONLY)
endif()
# 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)
@@ -1049,7 +1055,6 @@ 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()

#############################################################
@@ -7,9 +7,7 @@
set(CTEST_PROJECT_NAME "QGIS")
set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")

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()
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)

0 comments on commit c2f4c8e

Please sign in to comment.