Remove old buildname and options.

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

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 4477a9f..3624b1f 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -5,13 +5,20 @@ SET(BUILDNAME "none" CACHE TYPE INTERNAL FORCE)
 if(enable_memcheck)
        set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
 endif(enable_memcheck)
-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(CONTEXT_THREADS AND CONTEXT_UCONTEXT)
+       SET(BUILDNAME "BOTH_CONTEXT" CACHE TYPE INTERNAL FORCE)
+elseif(CONTEXT_THREADS AND CONTEXT_UCONTEXT)
+       
+       if(CONTEXT_UCONTEXT)
+               SET(BUILDNAME "UCONTEXT" CACHE TYPE INTERNAL FORCE)
+       endif(CONTEXT_UCONTEXT)
+       
+       if(CONTEXT_THREADS)
+               SET(BUILDNAME "PTHREAD" CACHE TYPE INTERNAL FORCE)
+       endif(CONTEXT_THREADS)
+
+endif(CONTEXT_THREADS AND CONTEXT_UCONTEXT)
 
 if(enable_compile_warnings AND enable_compile_optimizations)
        SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index 0af8afc..1bd1302 100644 (file)
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -19,17 +19,15 @@ perl ./simgrid-trunk/buildtools/pipol/cmake.pl
 
 cd simgrid-trunk
 
-#ucontext
+#ucontext and pthread
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=off \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -39,23 +37,4 @@ ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
 ctest -D ExperimentalTest
 ctest -D ExperimentalSubmit
-make clean
-
-#pthread
-cmake -Denable_lua=on \
--Denable_ruby=on \
--Denable_lib_static=on \
--Denable_graphviz=on \
--Denable_model-checking=off \
--Denable_tracing=on \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off \
--Denable_java=on \
--Dwith_context=pthread \
--Denable_smpi=on .
-ctest -D ExperimentalStart
-ctest -D ExperimentalConfigure
-ctest -D ExperimentalBuild
-ctest -D ExperimentalTest
-ctest -D ExperimentalSubmit
 make clean
\ No newline at end of file

diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh
index d15ce5c..d0b02b5 100644 (file)
--- a/buildtools/pipol/Experimental_all_simgrid_gt.sh
+++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh
@@ -21,17 +21,15 @@ cd simgrid-trunk
 
 rm CMakeCache.txt
 
-#ucontext
+#ucontext and pthread
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=off \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -43,36 +41,15 @@ ctest -D ExperimentalTest
 ctest -D ExperimentalSubmit
 make clean
 
-#pthread
-cmake -Denable_lua=on \
--Denable_ruby=on \
--Denable_lib_static=on \
--Denable_graphviz=on \
--Denable_model-checking=off \
--Denable_tracing=on \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off \
--Denable_java=on \
--Dwith_context=pthread \
--Denable_smpi=on .
-ctest -D ExperimentalStart
-ctest -D ExperimentalConfigure
-ctest -D ExperimentalBuild
-ctest -D ExperimentalTest
-ctest -D ExperimentalSubmit
-make clean
-
 #supernovae
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=on \
@@ -88,13 +65,11 @@ make clean
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -162,13 +137,12 @@ if [ $SYSTEM = Linux ] ; then
                cmake -Denable_lua=on \
                -Denable_ruby=on \
                -Denable_lib_static=on \
-               -Denable_graphviz=on \
                -Denable_model-checking=off \
                -Denable_tracing=on \
                -Denable_latency_bound_tracking=on \
                -Denable_gtnets=on \
+               -Dgtnets_path=$userhome/usr \
                -Denable_java=on \
-               -Dwith_context=auto \
                -Denable_smpi=on .
                ctest -D ExperimentalStart
                ctest -D ExperimentalConfigure
@@ -182,13 +156,11 @@ if [ $SYSTEM = Linux ] ; then
        cmake -Denable_lua=on \
        -Denable_ruby=on \
        -Denable_lib_static=on \
-       -Denable_graphviz=on \
        -Denable_model-checking=off \
        -Denable_tracing=on \
        -Denable_latency_bound_tracking=on \
        -Denable_gtnets=off \
        -Denable_java=on \
-       -Dwith_context=auto \
        -Denable_compile_optimizations=on \
        -Denable_compile_warnings=on \
        -Denable_smpi=on .

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 80f4a22..d91dc60 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -41,17 +41,15 @@ cd simgrid-trunk
 
 rm CMakeCache.txt
 
-#ucontext
+#ucontext and pthread
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=off \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -63,36 +61,15 @@ ctest -D NightlyTest
 ctest -D NightlySubmit
 make clean
 
-#pthread
-cmake -Denable_lua=on \
--Denable_ruby=on \
--Denable_lib_static=on \
--Denable_graphviz=on \
--Denable_model-checking=off \
--Denable_tracing=on \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off \
--Denable_java=on \
--Dwith_context=pthread \
--Denable_smpi=on .
-ctest -D NightlyStart
-ctest -D NightlyConfigure
-ctest -D NightlyBuild
-ctest -D NightlyTest
-ctest -D NightlySubmit
-make clean
-
 #full_flags
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=on \
 -Denable_compile_warnings=on \
 -Denable_smpi=on .
@@ -107,13 +84,11 @@ make clean
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=on \
@@ -129,13 +104,11 @@ make clean
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -203,13 +176,12 @@ if [ $SYSTEM = Linux ] ; then
                cmake -Denable_lua=on \
                -Denable_ruby=on \
                -Denable_lib_static=on \
-               -Denable_graphviz=on \
                -Denable_model-checking=off \
                -Denable_tracing=on \
                -Denable_latency_bound_tracking=on \
                -Denable_gtnets=on \
                -Denable_java=on \
-               -Dwith_context=auto \
+               -Dgtnets_path=$userhome/usr \
                -Denable_smpi=on .
                ctest -D NightlyStart
                ctest -D NightlyConfigure
@@ -220,9 +192,16 @@ if [ $SYSTEM = Linux ] ; then
        fi
 fi
 
-if( $PIPOL_IMAGE = i386-linux-ubuntu-karmic.dd.gz )
+if[ x$PIPOL_IMAGE = xi386-linux-ubuntu-karmic.dd.gz ]
        #Make the memcheck mode
-       cmake -Denable_gtnets=off \
+       cmake -Denable_lua=off \
+       -Denable_ruby=off \
+       -Denable_lib_static=off \
+       -Denable_model-checking=off \
+       -Denable_tracing=off \
+       -Denable_latency_bound_tracking=off \
+       -Denable_gtnets=off \
+       -Denable_java=off \
        -Denable_memcheck=on ./
        ctest -D NightlyStart
        ctest -D NightlyConfigure

diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh
index 73799cc..396b7a2 100644 (file)
--- a/buildtools/pipol/liste_install.sh
+++ b/buildtools/pipol/liste_install.sh
@@ -17,6 +17,9 @@ if [ -e /usr/bin/apt-get ] ; then
     sudo apt-get -y install graphviz-dev graphviz
     sudo apt-get -y install libpcre3-dev
     sudo apt-get -y install f2c
+    if [ x$PIPOL_IMAGE = xi386-linux-ubuntu-karmic.dd.gz ]
+       sudo apt-get -y install valgrind
+    fi
 else
        if [ -e /usr/bin/yum ] ; then
                sudo yum -y update

diff --git a/buildtools/pipol/no_test.sh b/buildtools/pipol/no_test.sh
index 3e0dc2a..20e73c6 100644 (file)
--- a/buildtools/pipol/no_test.sh
+++ b/buildtools/pipol/no_test.sh
@@ -2,59 +2,41 @@
 
 rm -f CMakeCache.txt
 
-#ucontext
+#ucontext and pthread
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=off \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
 -Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME'
 
-#pthread
-cmake -Denable_lua=on \
--Denable_ruby=on \
--Denable_lib_static=on \
--Denable_graphviz=on \
--Denable_model-checking=off \
--Denable_tracing=on \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off \
--Denable_java=on \
--Dwith_context=pthread \
--Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME'
-
 #gtnets
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
+-Dgtnets_path=/home/navarrop/gtnets/ \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME'
 
 #full_flags
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=on \
 -Denable_compile_warnings=on \
 -Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME'
@@ -63,13 +45,11 @@ cmake -Denable_lua=on \
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=on \
@@ -79,13 +59,11 @@ cmake -Denable_lua=on \
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -95,13 +73,11 @@ cmake -Denable_lua=on \
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \

diff --git a/buildtools/pipol/test_all.sh b/buildtools/pipol/test_all.sh
index d3b1f2b..be6a5ff 100644 (file)
--- a/buildtools/pipol/test_all.sh
+++ b/buildtools/pipol/test_all.sh
@@ -1,16 +1,14 @@
 rm CMakeCache.txt
 
-#ucontext
+#ucontext and pthread
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=off \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \
@@ -22,37 +20,17 @@ ctest -D ExperimentalTest
 ctest -D ExperimentalSubmit
 make clean
 
-#pthread
-cmake -Denable_lua=on \
--Denable_ruby=on \
--Denable_lib_static=on \
--Denable_graphviz=on \
--Denable_model-checking=off \
--Denable_tracing=on \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off \
--Denable_java=on \
--Dwith_context=pthread \
--Denable_smpi=on .
-ctest -D ExperimentalStart
-ctest -D ExperimentalConfigure
-ctest -D ExperimentalBuild
-ctest -D ExperimentalTest
-ctest -D ExperimentalSubmit
-make clean
-
 if [ `uname` != Darwin ]
        #gtnets
        cmake -Denable_lua=on \
        -Denable_ruby=on \
        -Denable_lib_static=on \
-       -Denable_graphviz=on \
        -Denable_model-checking=off \
        -Denable_tracing=on \
        -Denable_latency_bound_tracking=on \
        -Denable_gtnets=on \
+       -Dgtnets_path=/home/navarro/gtnets/ \
        -Denable_java=on \
-       -Dwith_context=auto \
        -Denable_smpi=on .
        ctest -D ExperimentalStart
        ctest -D ExperimentalConfigure
@@ -65,13 +43,11 @@ if [ `uname` != Darwin ]
        cmake -Denable_lua=on \
        -Denable_ruby=on \
        -Denable_lib_static=on \
-       -Denable_graphviz=on \
        -Denable_model-checking=off \
        -Denable_tracing=on \
        -Denable_latency_bound_tracking=on \
        -Denable_gtnets=off \
        -Denable_java=on \
-       -Dwith_context=auto \
        -Denable_compile_optimizations=on \
        -Denable_compile_warnings=on \
        -Denable_smpi=on .
@@ -87,13 +63,11 @@ fi
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=off \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=on \
@@ -109,13 +83,11 @@ make clean
 cmake -Denable_lua=on \
 -Denable_ruby=on \
 -Denable_lib_static=on \
--Denable_graphviz=on \
 -Denable_model-checking=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
 -Denable_java=on \
--Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_compile_warnings=off \
 -Denable_supernovae=off \