[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit e6341b7638ff2ef8014008307ad378f3727af793
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sat May 10 13:54:50 2008 +1000

    cron script uses new "devel" branches
    
    darcs-hash:20080510035450-d4795-399ac9b260822fb178b0f26255880c8ae8a93550.gz

diff --git a/test/template.tex b/test/template.tex
index 7610a81..379a94d 100644
--- a/test/template.tex
+++ b/test/template.tex
@@ -29,7 +29,12 @@
 
 This document is automatically generated from the results obtained
 when running the Gerris test suite. The test suite is run daily on the
-current stable branch of the version-controlled source code.
+development branch of the version-controlled source code. 
+
+Note that the stable branch (from which snapshot versions and packages
+are generated) is only updated when all of the tests succeed i.e. the
+status of the test cases below reflects the state of the development
+branch only.
 
 \section{Poisson}
 
diff --git a/tools/daily b/tools/daily
index 11dcd18..c0e52ca 100755
--- a/tools/daily
+++ b/tools/daily
@@ -22,6 +22,28 @@ export LD_LIBRARY_PATH=$wdir/local/lib:$LD_LIBRARY_PATH:/usr/local/lib
 export PKG_CONFIG_PATH=$wdir/local/lib/pkgconfig:$PKG_CONFIG_PATH
 ulimit -c unlimited
 
+# kill all running rsync processes. Assumes the only ones would be
+# hanging rsync from previous calls of this script!!
+killall rsync 2> /dev/null
+
+# synchronise devel branches
+darcs_synchronise()
+{
+    if ( cd $HOME/local/src/darcs/$1/$1-devel && \
+	darcs pull -a $gerrisweb/darcs/$1/$1-devel && \
+	darcs push -a $gerrisweb/darcs/$1/$1-devel ) > $wdir/sync 2>&1 ; then :
+    else
+	echo
+        echo ====== $HOME/local/src/darcs/$1/$1-devel: sync failed ======
+	echo
+	cat $wdir/sync
+	exit 1
+    fi
+}
+
+darcs_synchronise gerris
+darcs_synchronise gfsview
+
 # argument #1: repository to upgrade
 # argument #2: package name
 darcs_upgrade()
@@ -232,6 +254,8 @@ if ( $build_gerris || $build_gfsview ) ; then
 	   echo
 	   cat $wdir/darcs
        fi
+   fi
+   if test -z "$tests"; then
        if ( cd $wdir/$gerris/test && make tests.tar.gz && \
            rm -r -f $localgerrisweb/tests/* && \
            cp tests.tar.gz $localgerrisweb/tests/ && \

-- 
Gerris Flow Solver