trivial diff: running tests on hydra

[Fergus Henderson]

tools/test_mercury:
tools/run_all_test_from_cron:
	Some minor changes to get things to work on hydra.cs.mu.oz.au.

cvs diff: Diffing .
Index: run_all_tests_from_cron
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.9
diff -u -u -r1.9 run_all_tests_from_cron
--- run_all_tests_from_cron	1998/05/24 07:32:10	1.9
+++ run_all_tests_from_cron	1998/05/27 21:38:55
@@ -37,6 +37,7 @@
 
 case $HOST in
 	kryten) 	mail="rsh munta /bin/mail" ;;
+	hydra)		mail=/usr/bin/main ;;
 	*)		mail=/bin/mail ;;
 esac
 
@@ -73,7 +74,7 @@
 echo
 logfile=$tm_dir/logs/test_mercury_$HOST.out
 
-if /bin/nice -5 sh /tmp/test_mercury$$ $HOST $ARCH $FULLARCH \
+if nice -5 sh /tmp/test_mercury$$ $HOST $ARCH $FULLARCH \
 		> $logfile 2>&1
 then
 	echo test passed
Index: test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.71
diff -u -u -r1.71 test_mercury
--- test_mercury	1998/05/27 15:06:17	1.71
+++ test_mercury	1998/05/27 21:46:23
@@ -104,7 +104,10 @@
 # starting if we'll only run out of disk space.
 
 [ -d $DIR ] || mkdir -p $DIR
-FREE=`$DF $DIR | awk 'NR == 2 { print $4; }'`
+FREE=`$DF $DIR | awk '
+	NR == 2 && $NF > 4 { print $4; exit; }
+	NR == 3 { print $3; }
+'`
 if [ "$FREE" -lt 10000 ]; then
 	echo "Insufficient disk space on $DIR" 1>&2
 	$DF $DIR
@@ -213,10 +216,11 @@
 
 case $status in 0)
     case $install_anyway in
-        false)	cd mercury/stage2 || { false; exit 1; } ;;
+        false)	cd mercury/stage2 || { false; exit 1; }
 		# we need to use the stage1 compiler to do the install
 		MERCURY_COMPILER=$DIR/mercury/compiler/mercury_compile
 		export MERCURY_COMPILER
+		;;
         true)	cd mercury || { false; exit 1; } ;;
     esac
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.