Переглянути джерело

Change the nightly tests to build from the nightly branch and not next.

This will make sure that the nightly test matches the dashboard nightly section.
When it was next, it used next from when the test was run.
Bill Hoffman 15 роки тому
батько
коміт
faf1c1e49f
2 змінених файлів з 2 додано та 2 видалено
  1. 1 1
      Tests/CMakeLists.txt
  2. 1 1
      Utilities/Release/release_cmake.cmake

+ 1 - 1
Tests/CMakeLists.txt

@@ -321,7 +321,7 @@ IF(BUILD_TESTING)
     FILE(MAKE_DIRECTORY "${_TEST_DIR}")
     FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh"
       "cd ${_TEST_DIR}
-${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=next -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
+${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
 ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
     ")
     ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)

+ 1 - 1
Utilities/Release/release_cmake.cmake

@@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND)
   set(CVS_COMMAND cvs)
 endif(NOT DEFINED CVS_COMMAND)
 
-if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next)$")
+if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next|nightly)$")
   set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
 else()
   set(GIT_BRANCH ${CMAKE_CREATE_VERSION})