From 3e5e9c5a2393f5c8e988ed0abbaebed9273b21bb Mon Sep 17 00:00:00 2001 From: navarrop Date: Mon, 10 Jan 2011 10:32:33 +0000 Subject: [PATCH] Update pipol scripts git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9385 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/pipol/Experimental.sh | 1 - .../pipol/Experimental_all_simgrid_gt.sh | 92 +++++++++------ buildtools/pipol/Nightly_simgrid.sh | 107 ++++++------------ buildtools/pipol/liste_install.sh | 4 +- 4 files changed, 95 insertions(+), 109 deletions(-) diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh index 1bd1302d4a..f8e3523d42 100644 --- a/buildtools/pipol/Experimental.sh +++ b/buildtools/pipol/Experimental.sh @@ -19,7 +19,6 @@ perl ./simgrid-trunk/buildtools/pipol/cmake.pl cd simgrid-trunk -#ucontext and pthread cmake -Denable_lua=on \ -Denable_ruby=on \ -Denable_lib_static=on \ diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh index 119c24f1a4..f27514480e 100644 --- a/buildtools/pipol/Experimental_all_simgrid_gt.sh +++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh @@ -21,19 +21,19 @@ cd simgrid-trunk rm 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 . +-Denable_supernovae=off . ctest -D ExperimentalStart ctest -D ExperimentalConfigure ctest -D ExperimentalBuild @@ -41,19 +41,41 @@ ctest -D ExperimentalTest ctest -D ExperimentalSubmit make clean -#supernovae -cmake -Denable_lua=on \ +#full_flags +cmake \ +-Denable_lua=on \ -Denable_ruby=on \ --Denable_lib_static=on \ --Denable_model-checking=off \ +-Denable_java=on \ -Denable_tracing=on \ --Denable_latency_bound_tracking=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 ExperimentalStart +ctest -D ExperimentalConfigure +ctest -D ExperimentalBuild +ctest -D ExperimentalTest +ctest -D ExperimentalSubmit +make clean + +#supernovae +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 . +-Denable_lib_static=off \ +-Denable_model-checking=off \ +-Denable_latency_bound_tracking=off \ +-Denable_gtnets=off . ctest -D ExperimentalStart ctest -D ExperimentalConfigure ctest -D ExperimentalBuild @@ -62,18 +84,19 @@ ctest -D ExperimentalSubmit make clean #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=off \ --Denable_java=on \ -Denable_compile_optimizations=off \ -Denable_compile_warnings=off \ -Denable_supernovae=off \ --Denable_coverage=on \ +-Denable_lib_static=off \ -Denable_smpi=on . ctest -D ExperimentalStart ctest -D ExperimentalConfigure @@ -85,19 +108,20 @@ 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 - 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=./gtnets_install/ \ -Denable_java=on \ + -Dgtnets_path=$userhome/usr \ -Denable_coverage=off \ -Denable_smpi=on . ctest -D ExperimentalStart @@ -107,23 +131,25 @@ sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install/ ctest -D ExperimentalSubmit make clean fi - - #full_flags - cmake -Denable_lua=on \ - -Denable_ruby=on \ - -Denable_lib_static=on \ +fi + +if[ x$PIPOL_IMAGE = xi386-linux-ubuntu-karmic.dd.gz ] + #Make the memcheck mode + cmake \ + -Denable_lua=off \ + -Denable_ruby=off \ + -Denable_lib_static=off \ -Denable_model-checking=off \ - -Denable_tracing=on \ - -Denable_latency_bound_tracking=on \ + -Denable_tracing=off \ + -Denable_latency_bound_tracking=off \ + -Denable_coverage=off \ -Denable_gtnets=off \ - -Denable_java=on \ - -Denable_compile_optimizations=on \ - -Denable_compile_warnings=on \ - -Denable_smpi=on . + -Denable_java=off \ + -Denable_memcheck=on ./ ctest -D ExperimentalStart ctest -D ExperimentalConfigure ctest -D ExperimentalBuild - ctest -D ExperimentalTest + ctest -D ExperimentalMemCheck ctest -D ExperimentalSubmit make clean fi \ No newline at end of file diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index a426d58e16..771127c4ab 100644 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -41,19 +41,19 @@ cd simgrid-trunk rm 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 . +-Denable_supernovae=off . ctest -D NightlyStart ctest -D NightlyConfigure ctest -D NightlyBuild @@ -62,17 +62,19 @@ ctest -D NightlySubmit make clean #full_flags -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=off \ -Denable_java=on \ +-Denable_tracing=on \ +-Denable_smpi=on \ -Denable_compile_optimizations=on \ -Denable_compile_warnings=on \ --Denable_smpi=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 @@ -81,18 +83,19 @@ ctest -D NightlySubmit make clean #supernovae -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=off \ -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 . +-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 @@ -101,18 +104,19 @@ ctest -D NightlySubmit make clean #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=off \ --Denable_java=on \ -Denable_compile_optimizations=off \ -Denable_compile_warnings=off \ -Denable_supernovae=off \ --Denable_coverage=on \ +-Denable_lib_static=off \ -Denable_smpi=on . ctest -D NightlyStart ctest -D NightlyConfigure @@ -123,56 +127,10 @@ ctest -D NightlySubmit make clean if [ $SYSTEM = Linux ] ; then - cd .. - home_dir=`pwd` - - svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/GTNetS/ --quiet - cd GTNetS - unzip gtnets-current.zip > /dev/null - tar zxvf gtnets-current-patch.tgz > /dev/null - cd gtnets-current - cat ../00*.patch | patch -p1 > /dev/null - - ARCH_32=`uname -m | cut -d'_' -f2` - - if [ x$ARCH_32 = x64 ] ; then #only if 64 bit processor family - cat ../AMD64-FATAL-Removed-DUL_SIZE_DIFF-Added-fPIC-compillin.patch | patch -p1 > /dev/null - fi - - ln -sf Makefile.linux Makefile - make -j 3 depend > /dev/null - make -j 3 debug > /dev/null 2>&1 - make -j 3 opt > /dev/null 2>&1 - wait - cd $home_dir - absolute_path=`pwd` - userhome=$absolute_path - - if [ -e $userhome/usr/lib ] ; then - echo "" - else - mkdir $userhome/usr - mkdir $userhome/usr/lib - fi - - if [ -e $userhome/usr/include ] ; then - echo "" - else - mkdir $userhome/usr/include - fi - - cp -fr $absolute_path/GTNetS/gtnets-current/*.so $userhome/usr/lib/ - ln -sf $userhome/usr/lib/libgtsim-opt.so $userhome/usr/lib/libgtnets.so - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$userhome/usr/lib/ - mkdir $userhome/usr/include/gtnets - cp -fr $absolute_path/GTNetS/gtnets-current/SRC/*.h $userhome/usr/include/gtnets - wait - cd $home_dir - rm -rf $absolute_path/GTNetS - cd simgrid-trunk + sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install/ - if [ -e $userhome/usr/lib/libgtsim-opt.so ] ; then + if [ -e ./gtnets_install/lib/libgtsim-opt.so ] ; then #gtnets cmake -Denable_lua=on \ -Denable_ruby=on \ @@ -202,6 +160,7 @@ if[ x$PIPOL_IMAGE = xi386-linux-ubuntu-karmic.dd.gz ] -Denable_model-checking=off \ -Denable_tracing=off \ -Denable_latency_bound_tracking=off \ + -Denable_coverage=off \ -Denable_gtnets=off \ -Denable_java=off \ -Denable_memcheck=on ./ diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh index 0051957f82..163b057f9f 100644 --- a/buildtools/pipol/liste_install.sh +++ b/buildtools/pipol/liste_install.sh @@ -68,6 +68,7 @@ which_wget=`which wget` #wget for cmake which_dot=`which dot` #dot for cgraph which_perl=`which perl` #perl which_f2c=`which f2c` #f2c +which_gcov=`which gcov` #gcov echo $which_cmake echo $which_unzip echo $which_ruby @@ -80,4 +81,5 @@ echo $which_svn echo $which_dot echo $which_wget echo $which_perl -echo $which_f2c \ No newline at end of file +echo $which_f2c +echo $which_gcov \ No newline at end of file -- 2.20.1