--- a/Admin/isatest-check Fri May 27 00:24:02 2005 +0200
+++ b/Admin/isatest-check Fri May 27 01:09:44 2005 +0200
@@ -6,40 +6,23 @@
# DESCRIPTION: sends email for failed tests, checks for error.log,
# generates development snapshot if test ok
-# source bashrc, we're called by cron
-. ~/.bashrc
+## global settings
+. ~/admin/isatest-settings
# produce empty list for patterns like isatest-*.log if no
# such file exists
shopt -s nullglob
-## global settings
-
-# send mail to:
-MAILTO="kleing@in.tum.de nipkow@in.tum.de berghofe@in.tum.de schirmer@in.tum.de lp15@cam.ac.uk skalberg@in.tum.de makarius@sketis.net"
-
-ADMIN="berghofe@in.tum.de"
-
-# canoncical home for all platforms
-HOME=/usr/stud/isatest
-
-# where to find the distribution
-export DISTPREFIX=$HOME/tmp/isadist
+ADMIN="berghofe@in.tum.de kleing@in.tum.de"
# mail program
MAIL=$HOME/bin/pmail
-# where the logs are
-ERRORDIR=$HOME/var
-ERRORLOG=$ERRORDIR/error.log
-MASTERLOG=$HOME/log/isatest.log
-
-# where the test-still-running files are
-RUNNING=$HOME/var/running
-
# tmp file for sending mail
TMP=/tmp/isatest-makedist.$$
+export DISTPREFIX
+
## diagnostics
--- a/Admin/isatest-makeall Fri May 27 00:24:02 2005 +0200
+++ b/Admin/isatest-makeall Fri May 27 01:09:44 2005 +0200
@@ -6,18 +6,7 @@
# DESCRIPTION: Run isatool makeall from specified distribution and settings.
## global settings
-
-# canoncical home for all platforms
-HOME=/usr/stud/isatest
-
-# where the log files are
-LOGPREFIX=$HOME/log
-MASTERLOG=$LOGPREFIX/isatest.log
-ERRORDIR=$HOME/var
-ERRORLOG=$ERRORDIR/error.log
-
-# where to put test-is-running files
-RUNNING=$HOME/var/running
+. ~/admin/isatest-settings
# max time until test is aborted (in sec)
MAXTIME=28800
@@ -48,10 +37,7 @@
# argument checking
[ "$1" = "-?" ] && usage
-[ "$#" -lt "2" ] && usage
-
-DISTPREFIX=$1
-shift
+[ "$#" -lt "1" ] && usage
[ -d $DISTPREFIX ] || fail "$DISTPREFIX is not a directory."
--- a/Admin/isatest-makedist Fri May 27 00:24:02 2005 +0200
+++ b/Admin/isatest-makedist Fri May 27 01:09:44 2005 +0200
@@ -5,24 +5,12 @@
#
# DESCRIPTION: Build distribution and run isatest-make for lots of platforms.
-# source bashrc, we're called by cron
-. ~/.bashrc
-
-# canoncical home for all platforms
-HOME=/usr/stud/isatest
-
## global settings
-MAILTO="kleing@in.tum.de nipkow@in.tum.de berghofe@in.tum.de schirmer@in.tum.de lp15@cam.ac.uk skalberg@in.tum.de makarius@sketis.net haftmann@in.tum.de"
+. ~/admin/isatest-settings
TMP=/tmp/isatest-makedist.$$
MAIL=$HOME/bin/pmail
-LOGPREFIX=$HOME/log
-MASTERLOG=$LOGPREFIX/isatest.log
-ERRORDIR=$HOME/var
-ERRORLOG=$ERRORDIR/error.log
-RUNNING=$HOME/var/running
-DISTPREFIX=$HOME/tmp/isadist
MAKEDIST=$HOME/bin/makedist
MAKEALL=$HOME/bin/isatest-makeall
TAR=gtar
@@ -96,7 +84,6 @@
$TAR xvzf `cat $DISTPREFIX/ISABELLE_DIST` >> $DISTLOG 2>&1
echo ------------------- prepared test successfully --- `date` --- $HOSTNAME >> $DISTLOG 2>&1
-gzip -f $DISTLOG
ELAPSED=$("$HOME/bin/showtime" "$SECONDS")
echo "$(date) $HOSTNAME $PRG: dist build successful, elapsed time $ELAPSED." >> $MASTERLOG
@@ -104,17 +91,18 @@
## spawn test runs
-$SSH sunbroy2 "$MAKEALL $DISTPREFIX $HOME/settings/sun-poly $HOME/settings/sun-sml-dev"
+$SSH sunbroy2 "$MAKEALL $HOME/settings/sun-poly $HOME/settings/sun-sml-dev"
# give test some time to copy settings and start
sleep 5
-#$SSH sunbroy1 "$MAKEALL $DISTPREFIX $HOME/settings/sun-sml-dev"
-#sleep 5
-$SSH atbroy51 "$MAKEALL $DISTPREFIX $HOME/settings/at-poly $HOME/settings/at-sml-dev"
-#sleep 5
-#$SSH atbroy51 "$MAKEALL $DISTPREFIX $HOME/settings/at-sml-dev"
+$SSH atbroy51 "$MAKEALL $HOME/settings/at-poly $HOME/settings/at-sml-dev"
# wakeup call for macbroy33
wakeonlan -i 131.159.47.255 00:30:65:DA:35:E0 > /dev/null
sleep 5
-$SSH macbroy33 "$MAKEALL $DISTPREFIX $HOME/settings/mac-poly"
+$SSH macbroy33 "$MAKEALL $HOME/settings/mac-poly"
+
+
+echo ------------------- spawned tests successfully --- `date` --- $HOSTNAME >> $DISTLOG 2>&1
+
+gzip -f $DISTLOG
## end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/isatest-settings Fri May 27 01:09:44 2005 +0200
@@ -0,0 +1,23 @@
+# $Id$
+# Author: Gerwin Klein, NICTA
+#
+# DESCRIPTION: common settings for the isatest-* scripts
+
+# source bashrc, we're called by cron
+. ~/.bashrc
+
+# canoncical home for all platforms
+HOME=/home/stud/isatest
+
+## send email on failure to
+MAILTO="kleing@in.tum.de nipkow@in.tum.de berghofe@in.tum.de schirmer@in.tum.de lp15@cam.ac.uk skalberg@in.tum.de makarius@sketis.net haftmann@in.tum.de"
+
+LOGPREFIX=$HOME/log
+MASTERLOG=$LOGPREFIX/isatest.log
+
+ERRORDIR=$HOME/var
+ERRORLOG=$ERRORDIR/error.log
+
+RUNNING=$HOME/var/running
+
+DISTPREFIX=$HOME/tmp/isadist