diff: tools/test_mercury clpr changes

[Fergus Henderson]

tools/test_mercury:
	Checkout the `clpr' directory as mercury/extras/clpr on
	murlibobo (so it will get included in the distribution)
	and on kryten (so it can be tested).
	On kryten, run the usual tests in the `asm_fast.gc.tr' grade,
	and also test the `clpr' directory; change the optimization level
	from `-O3' to `-O1', to reduce testing times (currently about
	12 hrs on kryten).

Index: tools/test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.50
diff -u -u -r1.50 test_mercury
--- test_mercury	1997/08/25 08:39:36	1.50
+++ test_mercury	1997/09/06 14:47:46
@@ -46,7 +46,7 @@
 case $HOST in
 	# test things at different optimization levels...
 	murlibobo)	OPTIMIZE=-O5 ;;
-	kryten) 	OPTIMIZE=-O4 ;;
+	kryten) 	OPTIMIZE=-O1 ;;
 	mercury) 	OPTIMIZE=-O3 ;;
 	muse)		OPTIMIZE=-O0 ;;
 	munta)		OPTIMIZE=-O0 ;;
@@ -148,9 +148,17 @@
 
 set -x	# trace execution
 
-: checkout the sources and make sure the installation directory exists
+: checkout the sources
 cd $DIR || { false; exit 1; }
 cvs checkout $CHECKOUT_OPTS mercury tests || { false; exit 1; }
+case $HOST in
+	murlibobo|kryten)
+		(cd mercury/extras && cvs checkout $CHECKOUT_OPTS clpr) ||
+			{ false; exit 1; }
+		;;
+esac
+
+: make sure the installation directory exists
 [ -d $INSTALL_DIR ] || mkdir -p $INSTALL_DIR
 
 : update the VERSION file to specify the version we are building
@@ -313,7 +321,8 @@
 	kryten)
 		GRADES="none jump fast asm_jump asm_fast none.gc
 			jump.gc fast.gc asm_jump.gc
-			asm_fast.gc asm_fast.gc.prof asm_fast.prof"
+			asm_fast.gc asm_fast.gc.prof asm_fast.prof
+			asm_fast.gc.tr"
 		;;
 	muse|munta)
 		GRADES="reg.gc asm_fast asm_fast.gc
@@ -347,7 +356,19 @@
 			;;
 	esac
 done
+cd ..
 
+: test the CLPR interface
+case $HOST in
+	kryten)
+		(cd mercury/extras/clpr &&
+		 mmake depend	$PARALLEL MMAKEFLAGS=$PARALLEL &&
+		 mmake 		$PARALLEL MMAKEFLAGS=$PARALLEL &&
+		 mmake check	$PARALLEL MMAKEFLAGS=$PARALLEL &&
+		 mmake install	$PARALLEL MMAKEFLAGS=$PARALLEL) ||
+			status=1
+		;;
+esac
 
 #-----------------------------------------------------------------------------#
 
@@ -374,6 +395,8 @@
 	;;
     *)
 	: one or more tests failed
+	echo "some tests failed" 1>&2
+	fgrep '**' $TESTDIR/logs/test_mercury_$HOST
 	echo "test_mercury exiting unsuccessfully at `date`" 1>&2
 	false
 	exit 1

-- 
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.