Fix another script.

[simgrid.git] / buildtools / pipol / Nightly_simgrid.sh

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 80f4a22..a426d58 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,16 +104,15 @@ 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 \
+-Denable_coverage=on \
 -Denable_smpi=on .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
@@ -203,13 +177,13 @@ 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_coverage=off \
                -Denable_smpi=on .
                ctest -D NightlyStart
                ctest -D NightlyConfigure
@@ -220,9 +194,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