Merge pull request #230 from rossmuir/MAID-929_RemoveWeekly

Remove Weekly dashtype
maidsafe-archive · Mar 24, 2015 · a414bb8 · a414bb8
2 parents 47e60bb + 87a3e04
commit a414bb8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/CI.cmake.in b/CI.cmake.in
@@ -57,6 +57,6 @@ set(CTEST_GIT_COMMAND "@Git_EXECUTABLE@")
 set(CTEST_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
 set(CTEST_SOURCE_DIRECTORY "@CMAKE_SOURCE_DIR@")
 set(CTEST_BINARY_DIRECTORY "@CMAKE_BINARY_DIR@/build_CI_@DashType@_@TestConfType@")
-set(ExtraConfigureArgs "@CMakeArgs@;-DRUNNING_AS_CTEST_SCRIPT=TRUE;-DWEEKLY=@IsWeekly@")
+set(ExtraConfigureArgs "@CMakeArgs@;-DRUNNING_AS_CTEST_SCRIPT=TRUE")
 
 include("@CMAKE_BINARY_DIR@/ContinuousIntegration/run_ci.cmake")
diff --git a/cmake_modules/utils.cmake b/cmake_modules/utils.cmake
@@ -618,12 +618,7 @@ function(ms_setup_ci_scripts)
       list(APPEND TestConfTypes Asan Msan Tsan Ubsan)
     endif()
     foreach(TestConfType ${TestConfTypes})
-      foreach(DashType Experimental Continuous Nightly Weekly)
-        if(DashType STREQUAL Weekly)
-          set(IsWeekly ON)
-        else()
-          set(IsWeekly OFF)
-        endif()
+      foreach(DashType Experimental Continuous Nightly)
         string(SUBSTRING "#  This script runs the ${DashType} tests on all submodules of MaidSafe in ${TestConfType} mode.                                                                       "
                0 99 Documentation)
         configure_file(${CMAKE_SOURCE_DIR}/CI.cmake.in ${CMAKE_BINARY_DIR}/CI_${DashType}_${TestConfType}.cmake ESCAPE_QUOTES)