cvs diff: simplify tests/*/Mmake

[Fergus Henderson]

Simplify the way the Mmake files in the tests subdirectories use
different MCFLAGS for different files.

tests/Mmake.common:
	Add `MCFLAGS = $(MCFLAGS-$*) $(EXTRA_MCFLAGS)'.

tests/hard_coded/Mmake:
	Remove `MCFLAGS = $(MCFLAGS-$*) $(EXTRA_MCFLAGS)', since that
	is now in ../Mmake.common.

tests/general/Mmake:
tests/valid/Mmake:
	Set `MCFLAGS-<foo> = blah', rather than hard-coding the rule
	for `<foo>.c'.

cvs diff: Diffing .
Index: Mmake.common
===================================================================
RCS file: /home/staff/zs/imp/tests/Mmake.common,v
retrieving revision 1.6
diff -u -r1.6 Mmake.common
--- Mmake.common	1997/03/21 01:26:12	1.6
+++ Mmake.common	1997/04/21 09:36:47
@@ -1,5 +1,6 @@
 #-----------------------------------------------------------------------------#
 
+MCFLAGS = $(MCFLAGS-$*) $(EXTRA_MCFLAGS)
 MGNUCFLAGS=-g $(EXTRA_MGNUCFLAGS) $(EXTRA_CFLAGS)
 
 # override this with `mmake HAVE_NUPROLOG=yes'
cvs diff: Diffing benchmarks
cvs diff: Diffing general
Index: general/Mmake
===================================================================
RCS file: /home/staff/zs/imp/tests/general/Mmake,v
retrieving revision 1.39
diff -u -r1.39 Mmake
--- Mmake	1997/04/09 03:04:28	1.39
+++ Mmake	1997/04/21 09:37:23
@@ -66,9 +66,7 @@
 endif
 
 # mode_inf_bug needs to be compiled with `--infer-all'.
-mode_inf_bug.c: mode_inf_bug.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) --infer-all mode_inf_bug.m \
-		> mode_inf_bug.err 2>&1
+MCFLAGS-mode_inf_bug = --infer-all
 
 DEPENDS=$(PROGS:%=%.depend)
 OUTS=	$(PROGS:%=%.out)
cvs diff: Diffing hard_coded
Index: hard_coded/Mmake
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/Mmake,v
retrieving revision 1.41
diff -u -r1.41 Mmake
--- Mmake	1997/04/21 08:32:56	1.41
+++ Mmake	1997/04/21 09:43:12
@@ -20,7 +20,6 @@
 
 # some tests need to be compiled with particular options
 
-MCFLAGS			=	$(MCFLAGS-$*) $(EXTRA_MCFLAGS)
 MCFLAGS-func_test	=	--infer-all
 MCFLAGS-no_fully_strict	=	--no-fully-strict
 
cvs diff: Diffing invalid
cvs diff: Diffing misc_tests
cvs diff: Diffing valid
Index: valid/Mmake
===================================================================
RCS file: /home/staff/zs/imp/tests/valid/Mmake,v
retrieving revision 1.31
diff -u -r1.31 Mmake
--- Mmake	1997/04/21 05:22:29	1.31
+++ Mmake	1997/04/21 09:44:32
@@ -66,26 +66,12 @@
 
 all:	objs
 
-# we need to pass some options to really test middle_rec_labels.m
-middle_rec_labels.c: middle_rec_labels.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) --middle-rec --no-follow-vars \
-		middle_rec_labels.m > middle_rec_labels.err 2>&1
-
-two_way_unif.c: two_way_unif.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) -O-1 two_way_unif.m \
-		> two_way_unif.err 2>&1
-
-# The bug that simplify_bug.m tests for only occurred at -O-1
-simplify_bug.c:	simplify_bug.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) -O-1 \
-		simplify_bug.m > simplify_bug.err 2>&1
-
-compl_unify_bug.c: compl_unify_bug.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) -O3 \
-		compl_unify_bug.m > compl_unify_bug.err 2>&1
-
-vn_float.c: vn_float.m
-	$(MCG) --grade $(GRADE) $(MCGFLAGS) -O5 vn_float.m > vn_float.err 2>&1
+# some regression tests only failed with particular options enabled
+MCFLAGS-middle_rec_labels	= --middle-rec --no-follow-vars 
+MCFLAGS-two_way_unif		= -O-1
+MCFLAGS-simplify_bug		= -O-1
+MCFLAGS-compl_unify_bug		= -O3
+MCFLAGS-vn_float		= -O5
 
 # intermod_lambda.m needs inter-module optimization
 intermod_lambda.c:
cvs diff: Diffing warnings

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