Make a logical Site and Buildname for Cdash.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7089 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt
index d68b6e5..3856080 100644 (file)
--- a/buildtools/CPACK/src/CMakePrintArgs.txt
+++ b/buildtools/CPACK/src/CMakePrintArgs.txt
@@ -2,6 +2,8 @@ exec_program("echo `${CMAKE_C_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`"
 exec_program("echo `${CMAKE_CXX_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
 
 message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}${GIT_VERSION}) on arch (=${GRAS_THISARCH}):")
+message("      BUILDNAME :             ${BUILDNAME}")
+message("           SITE :             ${SITE}")
 message("")
 message("      Compiler: c++ :         ${CMAKE_CXX_COMPILER}")
 message("             version:         ${COMPILER_CXX_VERSION}")

diff --git a/buildtools/CPACK/src/CTestConfig.cmake b/buildtools/CPACK/src/CTestConfig.cmake
index ddf566d..d70cbb6 100644 (file)
--- a/buildtools/CPACK/src/CTestConfig.cmake
+++ b/buildtools/CPACK/src/CTestConfig.cmake
@@ -22,16 +22,33 @@ else(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   MARK_AS_ADVANCED(CAT)
   STRING(REPLACE " \\n \\l" "" DISTRIB2 ${DISTRIB})
 endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-
-
-         
+  
 getuname(osname -s)
 getuname(node -n)
 getuname(osrel  -r)
 getuname(cpu    -m)
        
-SET(BUILDNAME "${osname}_${DISTRIB2}_${cpu}")
-SET(CTEST_SITE "${node}")
+#SET(BUILDNAME "${osname}_${DISTRIB2}_${cpu}")
+#SET(CTEST_SITE "${node}")
+SET(BUILDNAME "none" CACHE TYPE INTERNAL FORCE)
+
+if(with_context MATCHES ucontext AND NOT supernovae)
+       SET(BUILDNAME "ucontext" CACHE TYPE INTERNAL FORCE)
+endif(with_context MATCHES ucontext AND NOT supernovae)
+
+if(with_context MATCHES pthread AND NOT supernovae)
+       SET(BUILDNAME "pthread" CACHE TYPE INTERNAL FORCE)
+endif(with_context MATCHES pthread AND NOT supernovae)
+
+if(enable_compile_warnings AND enable_compile_optimizations)
+       SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
+endif(enable_compile_warnings AND enable_compile_optimizations)
+
+if(supernovae)
+       SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
+endif(supernovae)
+SET(SITE "${osname}_${DISTRIB2}_${cpu}")
+SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")
 SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
 SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")