diff: .agc test cases bug fix

[Fergus Henderson]

tests/Mmake.common:
tests/valid/Mmakefile:
	For the tests of accurate gc, just add `--gc accurate'
	to GRADEFLAGS, rather than setting GRADE=asm_fast.agc.
	Otherwise the tests fail on systems for which we
	don't support asm_fast.* grades.

Index: Mmake.common
===================================================================
RCS file: /home/mercury1/repository/tests/Mmake.common,v
retrieving revision 1.8
diff -u -u -r1.8 Mmake.common
--- Mmake.common	1997/05/15 06:55:18	1.8
+++ Mmake.common	1997/11/22 17:05:37
@@ -1,15 +1,8 @@
 #-----------------------------------------------------------------------------#
 
+GRADEFLAGS = --grade $(GRADE) $(GRADEFLAGS-$*) $(EXTRA_GRADEFLAGS)
 MCFLAGS = $(MCFLAGS-$*) $(EXTRA_MCFLAGS)
 MGNUCFLAGS=-g $(EXTRA_MGNUCFLAGS) $(EXTRA_CFLAGS)
-
-# We only get to set the grade once, so take the first of either the
-# specific grade for the test, or the normal grade for all tests.  Note
-# that we evaluate NORMAL_GRADE now (using :=), so as to avoid GRADE
-# being defined in terms of itself.
-NORMAL_GRADE := $(GRADE)
-GRADE = $(firstword $(GRADE-$*) $(NORMAL_GRADE))
-
 
 # override this with `mmake HAVE_NUPROLOG=yes'
 # if you want to rebuild the `.exp' files.
Index: valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.2
diff -u -u -r1.2 Mmakefile
--- Mmakefile	1997/10/16 07:01:53	1.2
+++ Mmakefile	1997/11/22 17:06:48
@@ -94,12 +94,12 @@
 
 # some regression tests only failed with particular options enabled
 # (please keep this list sorted)
-GRADE-agc_graph			= asm_fast.agc
-GRADE-agc_ho_pred		= asm_fast.agc
-GRADE-agc_ite			= asm_fast.agc
-GRADE-agc_unbound_typevars	= asm_fast.agc
-GRADE-agc_unbound_typevars2	= asm_fast.agc
-GRADE-agc_unused_in		= asm_fast.agc
+GRADEFLAGS-agc_graph		= --gc accurate
+GRADEFLAGS-agc_ho_pred		= --gc accurate
+GRADEFLAGS-agc_ite		= --gc accurate
+GRADEFLAGS-agc_unbound_typevars	= --gc accurate
+GRADEFLAGS-agc_unbound_typevars2 = --gc accurate
+GRADEFLAGS-agc_unused_in	= --gc accurate
 MCFLAGS-compl_unify_bug		= -O3
 MCFLAGS-double_vn		= -O4
 MCFLAGS-higher_order_implied_mode = -O-1
@@ -113,15 +113,15 @@
 
 # intermod_lambda.m needs inter-module optimization
 intermod_lambda.c:
-	$(MCI) --grade $(GRADE) $(MCIFLAGS) intermod_lambda2.m
-	$(MCOI) --grade $(GRADE) $(MCOIFLAGS) intermod_lambda2.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) --intermodule-optimization \
+	$(MCI) $(GRADEFLAGS) $(MCIFLAGS) intermod_lambda2.m
+	$(MCOI) $(GRADEFLAGS) $(MCOIFLAGS) intermod_lambda2.m
+	$(MCG) $(GRADEFLAGS) $(MCGFLAGS) --intermodule-optimization \
 		intermod_lambda.m
 
 intermod_test.c:
-	$(MCI) --grade $(GRADE) $(MCIFLAGS) intermod_test2.m
-	$(MCOI) --grade $(GRADE) $(MCOIFLAGS) intermod_test2.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) --intermodule-optimization \
+	$(MCI) $(GRADEFLAGS) $(MCIFLAGS) intermod_test2.m
+	$(MCOI) $(GRADEFLAGS) $(MCOIFLAGS) intermod_test2.m
+	$(MCG) $(GRADEFLAGS) $(MCGFLAGS) --intermodule-optimization \
 		intermod_test.m
 
 check:	objs

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