update ctest script

digego · May 2, 2016 · dc7a11e · dc7a11e
1 parent a5a1a92
commit dc7a11e
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/extras/cmake/extempore_test.cmake b/extras/cmake/extempore_test.cmake
@@ -1,6 +1,5 @@
 set(CTEST_PROJECT_NAME Extempore)
 set(CTEST_SITE "Extempore")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 AEST")
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=Extempore")
@@ -29,14 +28,22 @@ elseif(WIN32)
   set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
 endif()
 
-set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone --depth 1 https://github.com/digego/extempore.git ${CTEST_SOURCE_DIRECTORY}")
+if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone https://github.com/digego/extempore.git ${CTEST_SOURCE_DIRECTORY}")
+endif()
+
 set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\" -DCMAKE_BUILD_TYPE=${CTEST_BUILD_CONFIGURATION} -DBUILD_TESTS=ON \"${CTEST_SOURCE_DIRECTORY}\"")
-set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND} pull")
-
-# do all the things
-ctest_start(Nightly)
-ctest_update()
-ctest_configure()
-ctest_build()
-ctest_test()
-ctest_submit()
+# set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND} pull")
+
+ctest_start(Continuous)
+ctest_update(RETURN_VALUE count)
+
+if(count GREATER 0)
+  # if master has been updated, run test and upload results
+  ctest_configure()
+  ctest_build()
+  ctest_test()
+  ctest_submit()
+else()
+  message(STATUS "No changes detected, current test results are up-do-date")
+endif()