From 23ab227245ea13faac1a8842caa08a797253470b Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 11 Jan 2011 11:27:28 +0000 Subject: [PATCH] Cosmetics. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9391 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../pipol/Experimental_all_simgrid_gt.sh | 2 +- buildtools/pipol/Nightly_simgrid.sh | 4 +- buildtools/pipol/no_test.sh | 104 +++++++++--------- 3 files changed, 58 insertions(+), 52 deletions(-) diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh index f27514480e..a98f14a0df 100644 --- a/buildtools/pipol/Experimental_all_simgrid_gt.sh +++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh @@ -108,7 +108,7 @@ make clean if [ $SYSTEM = Linux ] ; then - sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install/ + sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install if [ -e ./gtnets_install/lib/libgtsim-opt.so ] ; then #gtnets diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index 771127c4ab..f86cc9c5d3 100644 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -128,7 +128,7 @@ make clean if [ $SYSTEM = Linux ] ; then - sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install/ + sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install if [ -e ./gtnets_install/lib/libgtsim-opt.so ] ; then #gtnets @@ -163,7 +163,7 @@ if[ x$PIPOL_IMAGE = xi386-linux-ubuntu-karmic.dd.gz ] -Denable_coverage=off \ -Denable_gtnets=off \ -Denable_java=off \ - -Denable_memcheck=on ./ + -Denable_memcheck=on . ctest -D NightlyStart ctest -D NightlyConfigure ctest -D NightlyBuild diff --git a/buildtools/pipol/no_test.sh b/buildtools/pipol/no_test.sh index 20e73c6104..18cf7eaca9 100644 --- a/buildtools/pipol/no_test.sh +++ b/buildtools/pipol/no_test.sh @@ -2,84 +2,90 @@ rm -f CMakeCache.txt -#ucontext and pthread -cmake -Denable_lua=on \ +cmake \ +-Denable_lua=on \ -Denable_ruby=on \ --Denable_lib_static=on \ --Denable_model-checking=off \ +-Denable_java=on \ -Denable_tracing=on \ +-Denable_smpi=on \ +-Denable_lib_static=off \ +-Denable_model-checking=off \ -Denable_latency_bound_tracking=off \ -Denable_gtnets=off \ --Denable_java=on \ -Denable_compile_optimizations=off \ -Denable_compile_warnings=off \ --Denable_supernovae=off \ --Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME' +-Denable_supernovae=off . \ +2>&1 | grep -i 'BUILDNAME' -#gtnets -cmake -Denable_lua=on \ +cmake \ +-Denable_lua=on \ -Denable_ruby=on \ --Denable_lib_static=on \ --Denable_model-checking=off \ --Denable_tracing=on \ --Denable_latency_bound_tracking=on \ --Denable_gtnets=on \ --Dgtnets_path=/home/navarrop/gtnets/ \ -Denable_java=on \ --Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME' - -#full_flags -cmake -Denable_lua=on \ --Denable_ruby=on \ --Denable_lib_static=on \ --Denable_model-checking=off \ -Denable_tracing=on \ --Denable_latency_bound_tracking=on \ --Denable_gtnets=off \ --Denable_java=on \ +-Denable_smpi=on \ -Denable_compile_optimizations=on \ -Denable_compile_warnings=on \ --Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME' - -#supernovae -cmake -Denable_lua=on \ --Denable_ruby=on \ --Denable_lib_static=on \ +-Denable_lib_static=off \ -Denable_model-checking=off \ --Denable_tracing=on \ --Denable_latency_bound_tracking=on \ +-Denable_latency_bound_tracking=off \ -Denable_gtnets=off \ +-Denable_supernovae=off . \ +2>&1 | grep -i 'BUILDNAME' + +cmake \ +-Denable_lua=on \ +-Denable_ruby=on \ -Denable_java=on \ +-Denable_tracing=on \ +-Denable_smpi=on \ +-Denable_supernovae=on \ -Denable_compile_optimizations=off \ -Denable_compile_warnings=off \ --Denable_supernovae=on \ --Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME' +-Denable_lib_static=off \ +-Denable_model-checking=off \ +-Denable_latency_bound_tracking=off \ +-Denable_gtnets=off . \ +2>&1 | grep -i 'BUILDNAME' -#model checking -cmake -Denable_lua=on \ +cmake \ +-Denable_coverage=on \ +-Denable_lua=on \ -Denable_ruby=on \ --Denable_lib_static=on \ +-Denable_java=on \ -Denable_model-checking=on \ -Denable_tracing=on \ -Denable_latency_bound_tracking=on \ --Denable_gtnets=on \ --Denable_java=on \ +-Denable_gtnets=off \ -Denable_compile_optimizations=off \ -Denable_compile_warnings=off \ -Denable_supernovae=off \ --Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME' +-Denable_lib_static=off \ +-Denable_smpi=on . \ +2>&1 | grep -i 'BUILDNAME' -#memcheck -cmake -Denable_lua=on \ +cmake \ +-Denable_lua=on \ -Denable_ruby=on \ -Denable_lib_static=on \ --Denable_model-checking=on \ +-Denable_model-checking=off \ -Denable_tracing=on \ -Denable_latency_bound_tracking=on \ -Denable_gtnets=on \ -Denable_java=on \ --Denable_compile_optimizations=off \ --Denable_compile_warnings=off \ --Denable_supernovae=off \ --Denable_memcheck=on \ --Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME' \ No newline at end of file +-Dgtnets_path=~/gtnets \ +-Denable_coverage=off \ +-Denable_smpi=on . \ +2>&1 | grep -i 'BUILDNAME' + +cmake \ +-Denable_lua=off \ +-Denable_ruby=off \ +-Denable_lib_static=off \ +-Denable_model-checking=off \ +-Denable_tracing=off \ +-Denable_latency_bound_tracking=off \ +-Denable_coverage=off \ +-Denable_gtnets=off \ +-Denable_java=off \ +-Denable_memcheck=on . \ +2>&1 | grep -i 'BUILDNAME' \ No newline at end of file -- 2.20.1