Add gtnets to tests.

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

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index abb4ba1..0877e43 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -33,6 +33,7 @@ else(disable_gtnets)
        exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR)      
        if(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 0)
+               message(FATAL_ERROR "GTnetS doesn't works : set -Ddisable_gtnets=on")
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)
                set(INCLUDES

diff --git a/buildtools/CPACK/src/CTestConfig.cmake b/buildtools/CPACK/src/CTestConfig.cmake
index d70cbb6..5be31b9 100644 (file)
--- a/buildtools/CPACK/src/CTestConfig.cmake
+++ b/buildtools/CPACK/src/CTestConfig.cmake
@@ -33,11 +33,11 @@ getuname(cpu    -m)
 SET(BUILDNAME "none" CACHE TYPE INTERNAL FORCE)
 
 if(with_context MATCHES ucontext AND NOT supernovae)
-       SET(BUILDNAME "ucontext" CACHE TYPE INTERNAL FORCE)
+       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)
+       SET(BUILDNAME "PTHREAD" CACHE TYPE INTERNAL FORCE)
 endif(with_context MATCHES pthread AND NOT supernovae)
 
 if(enable_compile_warnings AND enable_compile_optimizations)
@@ -47,6 +47,12 @@ endif(enable_compile_warnings AND enable_compile_optimizations)
 if(supernovae)
        SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
 endif(supernovae)
+
+if(HAVE_GTNETS)
+       SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
+endif(HAVE_GTNETS)
+
+
 SET(SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")