[m-rev.] diff: test_mercury: don't test hl.* grades

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Disable tests of the hl.* grades; those grades don't work
	(you get compiler errors when compiling the generated C code),
	due to conflicts between the header files for hl.* and hlc.*.
	So the hl.* grades are now only tested by building and installing
	them, not by running the test suite.
	Also make sure that the hlc.* grades get installed after the
	hl.* grades, so that the final copy of the header files installed
	is the hlc.* header files.

	Also fix an old XXX: for ceres, bootstrap using the compiler
	in /home/ceres/mercury/public rather than the one in
	/home/mercury/public.  This will reduce NFS traffic.

Workspace: /home/mercury/public/test_mercury/scripts

Workspace: /home/mercury/public/test_mercury/scripts/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.172
diff -u -d -r1.172 test_mercury
--- tools/test_mercury	11 Dec 2001 07:24:21 -0000	1.172
+++ tools/test_mercury	12 Dec 2001 07:41:38 -0000
@@ -255,9 +255,7 @@
 
 # version of the mercury compiler to use for bootstrapping
 case $HOST in
-	hg|ender|roy|venus|earth|mars)
-		# XXX Add ceres to the list above once a compiler
-		# is installed there.
+	hg|ender|roy|venus|earth|mars|ceres)
 		BOOTSTRAP_MERCURY_COMPILER=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
 		;;
 	*)
@@ -333,8 +331,8 @@
 		export DEFAULT_GRADE
 		INSTALL_GRADE="hlc.gc"
 		INSTALL_LIBGRADES="hl.gc \
-			hlc.gc.prof hlc.gc.memprof hlc.gc.tr hlc.par.gc \
-			hl.gc.prof  hl.gc.memprof  hl.gc.tr  hl.par.gc"
+			hl.gc.prof  hl.gc.memprof  hl.gc.tr  hl.par.gc \
+			hlc.gc.prof hlc.gc.memprof hlc.gc.tr hlc.par.gc"
 		# Test the asm_fast.gc.tr.rt grade, but not on the 0.10 branch,
 		# since the asm_fast.gc.tr.rt grade is not yet implemented
 		# in the 0.10 branch.
@@ -619,6 +617,7 @@
 #-----------------------------------------------------------------------------#
 
 : test and install the CLPR interface
+# CLPR requires trailing, so here we only test the trailing grades.
 case $HOST in
 	murlibobo)
 		# requires --enable-all-grades
@@ -631,7 +630,10 @@
 		esac
 		;;
 	roy|ceres)
-		GRADES="hlc.gc.tr hl.gc.tr"
+		GRADES="hlc.gc.tr"
+    # XXX No point testing the hl.* grades; they don't work, because
+    # the hl.* header files are incompatible with the hlc.* header files.
+		## GRADES="$GRADES hl.gc.tr"
 		;;
 	*)
 		GRADES=""
@@ -793,8 +795,10 @@
 		esac
 		;;
 	roy|ceres)
-		GRADES="hlc.gc hlc.gc.prof hlc.gc.memprof hlc.gc.tr hlc.par.gc
-			hl.gc  hl.gc.prof  hl.gc.memprof  hl.gc.tr  hl.par.gc"
+		GRADES="hlc.gc hlc.gc.prof hlc.gc.memprof hlc.gc.tr hlc.par.gc"
+      # XXX No point testing the hl.* grades; they don't work, because
+      # the hl.* header files are incompatible with the hlc.* header files.
+		  ## GRADES="$GRADES hl.gc  hl.gc.prof  hl.gc.memprof  hl.gc.tr  hl.par.gc"
 		# Test the asm_fast.gc.tr.rt grade, but not on the 0.10 branch,
 		# since the asm_fast.gc.tr.rt grade is not yet implemented
 		# in the 0.10 branch.
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------