Update to latest cnahages used in buildbot status

1 files changed, 22 insertions, 22 deletions

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index a056cfb..75e61ee 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -41,7 +41,7 @@ else(NOT SITE_OS_NAME)
     set(CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")

   endif()

   if(SITE_BUILDNAME_SUFFIX)

-    set(CTEST_BUILD_NAME ${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX})

+    set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX}")

   endif()

   set(BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")

 endif(NOT SITE_OS_NAME)

@@ -98,15 +98,15 @@ else(CTEST_USE_TAR_SOURCE)
         set(NEED_REPOSITORY_CHECKOUT 1)

       endif()

 

-       if(${NEED_REPOSITORY_CHECKOUT})

+      if(${NEED_REPOSITORY_CHECKOUT})

         if(REPOSITORY_BRANCH)

-          set(GITUpdateOptions "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

+          set(CTEST_GIT_options "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" --single-branch \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

         else()

-          set(GITUpdateOptions "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

+          set(CTEST_GIT_options "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

         endif()

-        set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${GITUpdateOptions}")

+        set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${CTEST_GIT_options}")

       else()

-        set(GITUpdateOptions "pull")

+        set(CTEST_GIT_options "pull")

       endif()

       set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

     else(CTEST_USE_GIT_SOURCE)

@@ -134,12 +134,12 @@ else(CTEST_USE_TAR_SOURCE)
       endif()

       if(${NEED_REPOSITORY_CHECKOUT})

         set(CTEST_CHECKOUT_COMMAND

-            "${CTEST_SVN_COMMAND} co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")

-      else(${NEED_REPOSITORY_CHECKOUT})

+            "\"${CTEST_SVN_COMMAND}\" co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")

+      else()

         if(CTEST_REPO_VERSION)

           set(CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")

         endif()

-      endif(${NEED_REPOSITORY_CHECKOUT})

+      endif()

     endif(CTEST_USE_GIT_SOURCE)

   endif(LOCAL_UPDATE)

 endif(CTEST_USE_TAR_SOURCE)

@@ -191,14 +191,14 @@ endforeach(req)
 if(LOCAL_MEMCHECK_TEST)

   find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

   set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

   )

 else()

   if(LOCAL_COVERAGE_TEST)

     find_program(CTEST_COVERAGE_COMMAND NAMES gcov)

   endif()

   set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

   )

 endif()

 

@@ -240,20 +240,20 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
   configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)

   ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")

   ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)

-  if(${res} LESS 0 OR ${res} GREATER 0)

-    message(FATAL_ERROR "Failed configure: ${res}\n")

-  endif()

   if(LOCAL_SUBMIT)

     ctest_submit (PARTS Update Configure Notes)

   endif()

+  if(${res} LESS 0 OR ${res} GREATER 0)

+    file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")

+  endif()

 

   ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)

-  if(${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)

-    message(FATAL_ERROR "Failed build: ${res} with Errors=${errval}\n")

-  endif()

   if(LOCAL_SUBMIT)

     ctest_submit (PARTS Build)

   endif()

+  if(${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)

+    file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")

+  endif()

 

   if(NOT LOCAL_SKIP_TEST)

     if(NOT LOCAL_MEMCHECK_TEST)

@@ -262,13 +262,13 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
         ctest_submit (PARTS Test)

       endif()

       if(${res} LESS 0 OR ${res} GREATER 0)

-        message(FATAL_ERROR "Failed tests: ${res}\n")

+        file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")

       endif()

     else()

       ctest_memcheck (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args})

       if(LOCAL_SUBMIT)

         ctest_submit (PARTS MemCheck)

-      endif(LOCAL_SUBMIT)

+      endif()

     endif()

     if(LOCAL_COVERAGE_TEST)

       ctest_coverage (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)

@@ -278,7 +278,7 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
     endif()

   endif(NOT LOCAL_SKIP_TEST)

 

-  if(NOT LOCAL_MEMCHECK_TEST AND NOT LOCAL_NO_PACKAGE)

+  if(NOT LOCAL_MEMCHECK_TEST AND NOT LOCAL_NO_PACKAGE AND NOT LOCAL_SKIP_BUILD)

     ##-----------------------------------------------

     ## Package the product

     ##-----------------------------------------------

@@ -290,7 +290,7 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
     )

     file(WRITE ${CTEST_BINARY_DIRECTORY}/cpack.log "${cpackLog.err}" "${cpackLog}")

     if(cpackResult GREATER 0)

-      message (FATAL_ERROR "Failed packaging: ${cpackResult}\n")

+      file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed packaging: ${cpackResult}:${cpackLog.err} \n")

     endif()

-  endif(NOT LOCAL_MEMCHECK_TEST AND NOT LOCAL_NO_PACKAGE)

+  endif()

 #-----------------------------------------------------------------------------