[m-rev.] diff: don't run agc and aditi tests in the il grade

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.5
Branches: main

Don't run tests which aren't compatible with the IL grade.

tests/valid/Mmakefile:
	Don't run the accurate gc tests in the IL grade.
	Don't run the aditi tests for all possible IL grades.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.117
diff -u -r1.117 Mmakefile
--- Mmakefile	30 Oct 2002 03:30:24 -0000	1.117
+++ Mmakefile	5 Nov 2002 10:42:22 -0000
@@ -196,7 +196,13 @@
 ifeq "$(findstring hl,$(GRADE))$(findstring .agc,$(GRADE))" "hl"
 	PROGS0 = $(TYPECLASS_PROGS) $(OTHER_PROGS)
 else
-	PROGS0 = $(AGC_PROGS) $(TYPECLASS_PROGS) $(OTHER_PROGS)
+	# The agc.* tests don't work in the il grades, as the CLR has
+	# its own builtin GC.
+	ifneq "$(findstring il,$(GRADE))" ""
+		PROGS0 = $(TYPECLASS_PROGS) $(OTHER_PROGS)
+	else
+		PROGS0 = $(AGC_PROGS) $(TYPECLASS_PROGS) $(OTHER_PROGS)
+	endif
 endif
 
 # Base grades `jump' and `fast'
@@ -223,9 +229,9 @@
 endif
 
 # Aditi is not yet implemented for the MLDS back-end
-# (i.e. grades hl*).
+# (i.e. grades hl* java* il*).
 # It will never be implemented for deep profiling grades.
-ifneq "$(findstring hl,$(GRADE))$(findstring profdeep,$(GRADE))" ""
+ifneq "$(filter hl% java% il%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
     OBJ_PROGS=$(PROGS2)
 else
     OBJ_PROGS=$(PROGS2) $(ADITI_PROGS)

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