Pipol

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

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index 11aa5fd..29e80e1 100644 (file)
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -43,7 +43,7 @@ ctest -D ExperimentalTest
 ctest -D ExperimentalSubmit
 make clean
 
-#gtnets
+#MC
 cmake \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index e86e9b9..eff1b06 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -26,8 +26,6 @@
 #PIPOL esn x86_64_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 --user --silent
 #PIPOL esn x86_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 --user --silent
 
-SYSTEM=`uname`
-
 if [ -e ./pipol ] ; then
        rm -rf ./pipol/$PIPOL_HOST
        mkdir ./pipol/$PIPOL_HOST
@@ -39,55 +37,16 @@ fi
 cd ./pipol/$PIPOL_HOST
 
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
-
-sh ./simgrid-trunk/buildtools/pipol/liste_install.sh
-perl ./simgrid-trunk/buildtools/pipol/cmake.pl
-perl ./simgrid-trunk/buildtools/pipol/ruby.pl
-
 cd simgrid-trunk
 
-rm CMakeCache.txt
+sh ./buildtools/pipol/liste_install.sh
+sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
+SIMGRID_ROOT=`pwd`
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
+perl ./buildtools/pipol/cmake.pl
+perl ./buildtools/pipol/ruby.pl
 
-cmake \
--Denable_lua=on \
--Denable_ruby=on \
--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_compile_optimizations=off \
--Denable_compile_warnings=off \
--Denable_supernovae=off .
-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_java=on \
--Denable_tracing=on \
--Denable_smpi=on \
--Denable_compile_optimizations=on \
--Denable_compile_warnings=on \
--Denable_lib_static=off \
--Denable_model-checking=off \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off \
--Denable_supernovae=off .
-ctest -D NightlyStart
-ctest -D NightlyConfigure
-ctest -D NightlyBuild
-ctest -D NightlyTest
-ctest -D NightlySubmit
-make clean
+rm CMakeCache.txt
 
 #supernovae
 cmake \
@@ -97,83 +56,32 @@ cmake \
 -Denable_tracing=on \
 -Denable_smpi=on \
 -Denable_supernovae=on \
--Denable_compile_optimizations=off \
--Denable_compile_warnings=off \
+-Denable_compile_optimizations=on \
+-Denable_compile_warnings=on \
 -Denable_lib_static=off \
 -Denable_model-checking=off \
 -Denable_latency_bound_tracking=off \
 -Denable_gtnets=off .
-ctest -D NightlyStart
-ctest -D NightlyConfigure
-ctest -D NightlyBuild
-ctest -D NightlyTest
-ctest -D NightlySubmit
+ctest -D ExperimentalStart
+ctest -D ExperimentalConfigure
+ctest -D ExperimentalBuild
+ctest -D ExperimentalTest
+ctest -D ExperimentalSubmit
 make clean
 
-#model checking
+#MC
 cmake \
+-Denable_latency_bound_tracking=on \
+-Denable_gtnets=on \
+-Dgtnets_path=./gtnets_install \
 -Denable_coverage=on \
--Denable_lua=on \
--Denable_ruby=on \
--Denable_java=on \
 -Denable_model-checking=on \
--Denable_tracing=on \
--Denable_latency_bound_tracking=on \
--Denable_gtnets=off \
 -Denable_compile_optimizations=off \
--Denable_compile_warnings=off \
--Denable_supernovae=off \
--Denable_lib_static=off \
--Denable_smpi=on .
-ctest -D NightlyStart
-ctest -D NightlyConfigure
-ctest -D NightlyBuild
-ctest -D NightlyTest
-ctest -D NightlyCoverage
-ctest -D NightlySubmit
-make clean
-
-if [ $SYSTEM = Linux ] ; then
-
-       sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
-       
-       if [ -e ./gtnets_install/lib/libgtsim-opt.so ] ; then
-               #gtnets
-               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 \
-               -Denable_java=on \
-               -Dgtnets_path=$userhome/usr \
-               -Denable_coverage=off \
-               -Denable_smpi=on .
-               ctest -D NightlyStart
-               ctest -D NightlyConfigure
-               ctest -D NightlyBuild
-               ctest -D NightlyTest
-               ctest -D NightlySubmit
-               make clean
-       fi
-
-       #Make the memcheck mode
-       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 .
-       ctest -D NightlyStart
-       ctest -D NightlyConfigure
-       ctest -D NightlyBuild
-       ctest -D NightlyMemCheck
-       ctest -D NightlySubmit
-       make clean
-       
-fi
\ No newline at end of file
+-Denable_supernovae=off .
+ctest -D ExperimentalStart
+ctest -D ExperimentalConfigure
+ctest -D ExperimentalBuild
+ctest -D ExperimentalTest
+ctest -D ExperimentalCoverage
+ctest -D ExperimentalSubmit
+make clean
\ No newline at end of file

diff --git a/buildtools/pipol/deploy.sh b/buildtools/pipol/deploy.sh
index f8d8859..91c1bbc 100644 (file)
--- a/buildtools/pipol/deploy.sh
+++ b/buildtools/pipol/deploy.sh
@@ -2,43 +2,43 @@
 
 #___________________________________________________________________________________________________
 #Ubuntu 9.04________________________________________________________________________________________
-ssh pipol pipol-sub esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 "~/Experimental.sh"
 
-Ubuntu 9.10
-ssh pipol pipol-sub esn i386-linux-ubuntu-karmic.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+#Ubuntu 9.10
+ssh pipol pipol-sub esn i386-linux-ubuntu-karmic.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 "~/Experimental.sh"
 
 #Ubuntu 10.04
-ssh pipol pipol-sub esn i386-linux-ubuntu-lucid.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64-linux-ubuntu-lucid.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386-linux-ubuntu-lucid.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64-linux-ubuntu-lucid.dd.gz none 02:00 "~/Experimental.sh"
 
 #Ubuntu 10.10
-ssh pipol pipol-sub esn amd64_2010-linux-ubuntu-maverick.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn amd64_2010-linux-ubuntu-maverick.dd.gz none 02:00 "~/Experimental.sh"
 
 #___________________________________________________________________________________________________
 #Fedora 11__________________________________________________________________________________________
-ssh pipol pipol-sub esn i386-linux-fedora-core11.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64-linux-fedora-core11.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386-linux-fedora-core11.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64-linux-fedora-core11.dd.gz none 02:00 "~/Experimental.sh"
 
 #Fedora 12
-ssh pipol pipol-sub esn i386-linux-fedora-core12.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64-linux-fedora-core12.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386-linux-fedora-core12.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64-linux-fedora-core12.dd.gz none 02:00 "~/Experimental.sh"
 
 #Fedora 13
-ssh pipol pipol-sub esn i386-linux-fedora-core13.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64-linux-fedora-core13.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386-linux-fedora-core13.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64-linux-fedora-core13.dd.gz none 02:00 "~/Experimental.sh"
 
 #___________________________________________________________________________________________________
 #Debian Lenny 5.0___________________________________________________________________________________
-ssh pipol pipol-sub esn i386_kvm-linux-debian-lenny none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64_kvm-linux-debian-lenny none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386_kvm-linux-debian-lenny none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64_kvm-linux-debian-lenny none 02:00 "~/Experimental.sh"
 
 #Debian Testing
-ssh pipol pipol-sub esn i386_kvm-linux-debian-testing none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn amd64_kvm-linux-debian-testing none 02:00 "~/Experimental_all_simgrid_gt.sh"
+ssh pipol pipol-sub esn i386_kvm-linux-debian-testing none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn amd64_kvm-linux-debian-testing none 02:00 "~/Experimental.sh"
 
 #___________________________________________________________________________________________________
 #MacOS Snow Leopard 10.6____________________________________________________________________________
-ssh pipol pipol-sub esn x86_64_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
-ssh pipol pipol-sub esn x86_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental_all_simgrid_gt.sh"
\ No newline at end of file
+ssh pipol pipol-sub esn x86_64_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental.sh"
+ssh pipol pipol-sub esn x86_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental.sh"
\ No newline at end of file