# HG changeset patch
# User kleing
# Date 1024604248 -7200
# Node ID 5ab7bac534c93fc67103afd822e9c28d6ad3c148
# Parent  8b1b5e8c4bd62821de587e87c10728d537d610e6
tuned

diff -r 8b1b5e8c4bd6 -r 5ab7bac534c9 Admin/isatest-makeall
--- a/Admin/isatest-makeall	Thu Jun 20 22:17:15 2002 +0200
+++ b/Admin/isatest-makeall	Thu Jun 20 22:17:28 2002 +0200
@@ -58,12 +58,14 @@
 
     echo ------------------- starting test --- `date` --- $HOSTNAME > $TESTLOG 2>&1
 
-    cp -v $SETTINGS $DISTPREFIX/Isabelle/etc/settings >> $TESTLOG 2>&1 
+    cp $DISTPREFIX/Isabelle/etc/settings $DISTPREFIX/Isabelle/etc/settings.save-$SHORT
+    cat $SETTINGS >> $DISTPREFIX/Isabelle/etc/settings
     $DISTPREFIX/Isabelle/bin/isatool makeall all >> $TESTLOG 2>&1 
 
     if [ $? -eq 0 ]
     then
         echo ------------------- test successfull --- `date` --- $HOSTNAME >> $TESTLOG 2>&1
+        mv $DISTPREFIX/Isabelle/etc/settings-$SHORT $DISTPREFIX/Isabelle/etc/settings
         gzip -f $TESTLOG
     else
         echo ------------------- test FAILED --- `date` --- $HOSTNAME >> $TESTLOG 2>&1
diff -r 8b1b5e8c4bd6 -r 5ab7bac534c9 Admin/isatest-makedist
--- a/Admin/isatest-makedist	Thu Jun 20 22:17:15 2002 +0200
+++ b/Admin/isatest-makedist	Thu Jun 20 22:17:28 2002 +0200
@@ -7,14 +7,14 @@
 # DESCRIPTION: Build distribution and run isatest-make for lots of platforms.
 
 ## global settings
-LOGPREFIX=~
+LOGPREFIX=~/log
 DISTPREFIX=~/isadist
 MAKEDIST=~/bin/makedist
 
 SUN=sunbroy2
 AT=atbroy37
 
-SSH="ssh -1 -f"
+SSH="ssh -f"
 
 ## diagnostics
 
@@ -43,9 +43,6 @@
 DATE=$(date "+%d-%b-%Y")
 DISTLOG=$LOGPREFIX/isatest-makedist-$DATE.log
 
-# get newest version of makedist:
-# cvs -d sunbroy2:/usr/proj/isabelle-repository/archive co isabelle/Admin > $COUTLOG
-
 echo ------------------- preparing test release --- `date` --- $HOSTNAME > $DISTLOG 2>&1
 
 echo "### cleaning up old dist directory"  >> $DISTLOG 2>&1
@@ -69,10 +66,10 @@
 ## spawn test runs
 
 # run tests in parallel on multiprocessor sun 
-$SSH $SUN sun-poly   
-$SSH $SUN sun-sml
+$SSH $SUN "$MAKEDIST $DISTPREFIX ~/settings/sun-poly"
+$SSH $SUN "$MAKEDIST $DISTPREFIX ~/settings/sun-sml"
 
 # run tests sequentially on x86
-$SSH $AT at-poly at-sml
+$SSH $AT "$MAKEDIST $DISTPREFIX ~/settings/at-poly ~/settings/at-sml"
 
 ## end
\ No newline at end of file