correction of the ctest output size

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

diff --git a/buildtools/ctest/Cmake/CTestConfig.cmake b/buildtools/ctest/Cmake/CTestConfig.cmake
index 2ac3a6f..5af3384 100644 (file)
--- a/buildtools/ctest/Cmake/CTestConfig.cmake
+++ b/buildtools/ctest/Cmake/CTestConfig.cmake
@@ -37,3 +37,5 @@ SET (CTEST_DROP_METHOD "http")
 SET (CTEST_DROP_SITE "cdash.inria.fr/CDash")
 SET (CTEST_DROP_LOCATION "/submit.php?project=Simgrid")
 SET (CTEST_DROP_SITE_CDASH TRUE)
 SET (CTEST_DROP_SITE "cdash.inria.fr/CDash")
 SET (CTEST_DROP_LOCATION "/submit.php?project=Simgrid")
 SET (CTEST_DROP_SITE_CDASH TRUE)

+SET (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "30000")
+SET (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "30000")

diff --git a/buildtools/ctest/reservall.sh b/buildtools/ctest/reservall.sh
index c518967..9feb244 100755 (executable)
--- a/buildtools/ctest/reservall.sh
+++ b/buildtools/ctest/reservall.sh
@@ -12,7 +12,6 @@ ssh pipol pipol-sub esn amd64-linux-debian-lenny.dd.gz none 02:00 /home/mescal/n
 
 ssh pipol pipol-sub esn i386-linux-fedora-core11.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 ssh pipol pipol-sub esn amd64-linux-fedora-core11.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 
 ssh pipol pipol-sub esn i386-linux-fedora-core11.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 ssh pipol pipol-sub esn amd64-linux-fedora-core11.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh

-

 ssh pipol pipol-sub esn i386-linux-mandriva-2009_powerpack.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 ssh pipol pipol-sub esn amd64-linux-mandriva-2009_powerpack.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 
 ssh pipol pipol-sub esn i386-linux-mandriva-2009_powerpack.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 ssh pipol pipol-sub esn amd64-linux-mandriva-2009_powerpack.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
 

diff --git a/buildtools/ctest/test_simgrid_pipol.sh b/buildtools/ctest/test_simgrid_pipol.sh
index 2efd2be..e82be52 100755 (executable)
--- a/buildtools/ctest/test_simgrid_pipol.sh
+++ b/buildtools/ctest/test_simgrid_pipol.sh
@@ -1,19 +1,91 @@
 #! /bin/sh
 
 #! /bin/sh
 

-#PIPOL esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
+#PIPOL esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent
+#PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent 

 
 

-#PIPOL esn i386-linux-debian-etch.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn i386-linux-debian-lenny.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn amd64-linux-debian-etch.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn amd64-linux-debian-lenny.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
+#PIPOL esn i386-linux-debian-etch.dd.gz none 02:00 --user --silent
+#PIPOL esn i386-linux-debian-lenny.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-debian-etch.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-debian-lenny.dd.gz none 02:00 --user --silent

 
 

-#PIPOL esn i386-linux-fedora-core11.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn amd64-linux-fedora-core11.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
+#PIPOL esn i386-linux-fedora-core11.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-fedora-core11.dd.gz none 02:00 --user --silent

 
 

-#PIPOL esn i386-linux-mandriva-2009_powerpack.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
-#PIPOL esn amd64-linux-mandriva-2009_powerpack.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
+#PIPOL esn i386-linux-mandriva-2009_powerpack.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-mandriva-2009_powerpack.dd.gz none 02:00 --user --silent

 
 

-#PIPOL esn i386_mac-mac-osx-server-leopard.dd.gz none 02:00 /home/mescal/navarro/script/verif.sh
+#PIPOL esn i386_mac-mac-osx-server-leopard.dd.gz none 02:00 --user --silent
+
+#GET the OS name
+OS=`uname`
+node=`uname -n`
+
+# OS specific working directory 
+BASEDIR=/pipol
+DIR=$BASEDIR/$OS/$node
+
+# Clean any leftover  from previous install
+echo "remove old directory $BASEDIR/$OS/$node"
+rm -rf $BASEDIR/$OS/$node
+
+# create a new directory 
+echo "create new directory $BASEDIR/$OS/$node"
+mkdir  $BASEDIR/$OS
+mkdir  $BASEDIR/$OS/$node
+cd $BASEDIR/$OS/$node
+
+# load the simgrid directory from svn
+echo "load simgrid-svn"
+svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk
+mv trunk/ simgrid
+cp -r $BASEDIR/$OS/$node/simgrid/buildtools/ctest/Cmake $BASEDIR/$OS/$node/simgrid/Cmake
+
+
+
+if [[ $OS == 'Linux' ]]; then
+       # Install dependencies Linux
+       echo "get dependencies Linux"
+       sudo aptitude install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind
+       # 1er test
+       cd $BASEDIR/$OS/$node/simgrid
+       echo "./bootstrap"
+       ./bootstrap
+       echo "./configure"
+       ./configure --enable-maintainer-mode --disable-compile-optimizations
+       echo "make"
+       make 
+       echo "./checkall"
+       ./checkall
+       # 2eme test ctest
+       sudo aptitude install -y cmake
+       cd $BASEDIR/$OS/$node/simgrid/Cmake
+       cmake ./
+       ctest -D Nightly
+fi
+
+if [[ $OS == 'Darwin' ]]; then
+       # Install dependencies Mac
+       echo "get dependencies Mac"
+       fink --yes install libtool14
+        # fink --yes install doxygen 
+        fink --yes install autoconf
+       # 1er test
+       cd $BASEDIR/$OS/$node/simgrid
+       echo "./bootstrap"
+       ./bootstrap
+       echo "./configure"
+       ./configure --enable-maintainer-mode MAKE=gmake --disable-compile-optimizations
+       echo "make"
+       make 
+       echo "./checkall"
+       ./checkall
+       # 2eme test ctest
+       fink --yes install cmake
+       cd $BASEDIR/$OS/$node/simgrid/Cmake
+       cmake ./
+       ctest -D Nightly
+fi
+
+echo "Finish !"

diff --git a/buildtools/ctest/test_simgrid_pipol2.sh b/buildtools/ctest/test_simgrid_pipol2.sh
new file mode 100644 (file)
index 0000000..9cfb52d
--- /dev/null
+++ b/buildtools/ctest/test_simgrid_pipol2.sh
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+#PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
+OS=`uname`
+mkdir /home/mescal/navarro/exec1
+mkdir /home/mescal/navarro/exec1/$OS
+
+#PIPOL esn i386_mac-mac-osx-server-leopard.dd.gz none 02:00 --user --silent
+
+mkdir /home/mescal/navarro/exec2
+
+OS=`uname`
+mkdir /home/mescal/navarro/exec1/$OS
+
+echo "Finish !"

diff --git a/buildtools/ctest/verif.sh b/buildtools/ctest/verif.sh
index eb2eb25..41c9d23 100755 (executable)
--- a/buildtools/ctest/verif.sh
+++ b/buildtools/ctest/verif.sh
@@ -22,27 +22,50 @@ cd $BASEDIR/$OS/$node
 echo "load simgrid-svn"
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk
 mv trunk/ simgrid
 echo "load simgrid-svn"
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk
 mv trunk/ simgrid

-cp simgrid/buildtools/ctest/Cmake simgrid-svn/Cmake
-
-# Install dependencies
-echo "get dependencies"
-sudo aptitude install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind
-
-# 1er test
-cd $BASEDIR/$OS/$node/simgrid
-echo "./bootstrap"
-./bootstrap
-echo "./configure"
-./configure --enable-maintainer-mode --disable-compile-optimizations
-echo "make"
-make 
-echo "./checkall"
-./checkall
-
-# 2eme test ctest
-sudo aptitude install -y cmake
-cd $BASEDIR/$OS/$node/simgrid/Cmake
-cmake ./
-ctest -D Experimental
+cp -r $BASEDIR/$OS/$node/simgrid/buildtools/ctest/Cmake $BASEDIR/$OS/$node/simgrid/Cmake
+
+if [[ $OS == 'Linux' ]]; then
+       # Install dependencies Linux
+       echo "get dependencies Linux"
+       sudo aptitude install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind
+       # 1er test
+       cd $BASEDIR/$OS/$node/simgrid
+       echo "./bootstrap"
+       ./bootstrap
+       echo "./configure"
+       ./configure --enable-maintainer-mode --disable-compile-optimizations
+       echo "make"
+       make 
+       echo "./checkall"
+       ./checkall
+       # 2eme test ctest
+       sudo aptitude install -y cmake
+       cd $BASEDIR/$OS/$node/simgrid/Cmake
+       cmake ./
+       ctest -D Experimental
+fi
+
+if [[ $OS == 'Darwin' ]]; then
+       # Install dependencies Mac
+       echo "get dependencies Mac"
+       fink --yes install libtool14
+        # fink --yes install doxygen 
+        fink --yes install autoconf
+       # 1er test
+       cd $BASEDIR/$OS/$node/simgrid
+       echo "./bootstrap"
+       ./bootstrap
+       echo "./configure"
+       ./configure --enable-maintainer-mode MAKE=gmake --disable-compile-optimizations
+       echo "make"
+       make 
+       echo "./checkall"
+       ./checkall
+       # 2eme test ctest
+       fink --yes install cmake
+       cd $BASEDIR/$OS/$node/simgrid/Cmake
+       cmake ./
+       ctest -D Experimental
+fi

 
 echo "Done!"
 
 echo "Done!"

diff --git a/buildtools/ctest/verif_mac.sh b/buildtools/ctest/verif_mac.sh
new file mode 100755 (executable)
index 0000000..8f58f3d
--- /dev/null
+++ b/buildtools/ctest/verif_mac.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+#GET the OS name
+OS=`uname`
+node=`uname -n`
+
+# OS specific working directory 
+BASEDIR=/pipol
+DIR=$BASEDIR/$OS/$node
+
+# Clean any leftover  from previous install
+echo "remove old directory $BASEDIR/$OS/$node"
+rm -rf $BASEDIR/$OS/$node
+
+# create a new directory 
+echo "create new directory $BASEDIR/$OS/$node"
+mkdir  $BASEDIR/$OS
+mkdir  $BASEDIR/$OS/$node
+cd $BASEDIR/$OS/$node
+
+# load the simgrid directory from svn
+echo "load simgrid-svn"
+svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk
+mv trunk/ simgrid
+cp -r $BASEDIR/$OS/$node/simgrid/buildtools/ctest/Cmake $BASEDIR/$OS/$node/simgrid/Cmake
+
+# Install dependencies
+echo "get dependencies"
+fink --yes install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind
+
+# 1er test
+cd $BASEDIR/$OS/$node/simgrid
+echo "./bootstrap"
+./bootstrap
+echo "./configure"
+./configure --enable-maintainer-mode --disable-compile-optimizations
+echo "make"
+make 
+echo "./checkall"
+./checkall
+
+# 2eme test ctest
+fink --yes install cmake
+cd $BASEDIR/$OS/$node/simgrid/Cmake
+cmake ./
+ctest -D Experimental
+
+echo "Done!"