[m-rev.] diff: don't test hl.* grades on release branch

[Simon Taylor]

Estimated hours taken: 0.25

tools/test_mercury:
	Don't test the hl.* grades on the release branch because
	the change to allow hl.* and hlc.* to both be installed
	was only committed on the main branch.

Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.180
diff -u -u -r1.180 test_mercury
--- test_mercury	15 Jul 2002 07:12:02 -0000	1.180
+++ test_mercury	30 Jul 2002 05:22:02 -0000
@@ -331,16 +331,21 @@
 		DEFAULT_GRADE="hlc.gc"
 		export DEFAULT_GRADE
 		INSTALL_GRADE="hlc.gc"
-		INSTALL_LIBGRADES="hl.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"
+		INSTALL_LIBGRADES="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.
+		#	
+		# The hl.* grades don't work on the release branch because
+		# we can only install the header files for one grade, and the 
+		# headers for hl.gc and hlc.gc are different. This has been
+		# fixed on the main branch.
 		case $BRANCH in
 			0.10)	;;
-			*)	INSTALL_LIBGRADES="$INSTALL_LIBGRADES \
-					asm_fast.gc.tr.rt" ;;
+			*)	INSTALL_LIBGRADES="$INSTALL_LIBGRADES
+					asm_fast.gc.tr.rt hl.gc hl.gc.prof
+					hl.gc.memprof hl.gc.tr hl.par.gc" ;;
 		esac
 		;;
 	hg)
@@ -631,7 +636,16 @@
 		esac
 		;;
 	roy|ceres)
-		GRADES="hlc.gc.tr hl.gc.tr"
+		GRADES="hlc.gc.tr"
+
+		# The hl.* grades don't work on the release branch because
+		# we can only install the header files for one grade, and the 
+		# headers for hl.gc and hlc.gc are different. This has been
+		# fixed on the main branch.
+		case $BRANCH in
+			0.10)	;;
+			*)	GRADES="$GRADES hl.gc.tr" ;;
+		esac
 		;;
 	*)
 		GRADES=""
@@ -793,14 +807,20 @@
 		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"
 		# 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.
+		#
+		# The hl.* grades don't work on the release branch because
+		# we can only install the header files for one grade, and the 
+		# headers for hl.gc and hlc.gc are different. This has been
+		# fixed on the main branch.
 		case $BRANCH in
 			0.10)	;;
-			*)	GRADES="$GRADES asm_fast.gc.tr.rt" ;;
+			*)	GRADES="$GRADES asm_fast.gc.tr.rt
+					hl.gc hl.gc.prof hl.gc.memprof
+					hl.gc.tr hl.par.gc" ;;
 		esac
 		;;
 	ender)
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------