[m-rev.] diff: fix extras/trailed_update/tests/var_test

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Nov 13 16:49:29 AEDT 2002


Estimated hours taken: 0.1
Branches: main, release

extras/trailed_update/tests/Mmakefile:
        Fix a bug where Mmake.params (which can set $(GRADE))
	was being included after a place that tests $(GRADE).
	This is essentially the same as the bug recently fixed in
	extras/trailed_update/samples/Mmakefile.

Workspace: /home/mars/fjh/ws1/mercury
Index: extras/trailed_update/tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/tests/Mmakefile,v
retrieving revision 1.8
diff -u -d -r1.8 Mmakefile
--- extras/trailed_update/tests/Mmakefile	10 Nov 2002 13:39:20 -0000	1.8
+++ extras/trailed_update/tests/Mmakefile	13 Nov 2002 05:47:34 -0000
@@ -29,6 +29,11 @@
 
 #-----------------------------------------------------------------------------#
 
+# The Mmake.params file can be used to override definitions in this file
+-include ../../Mmake.params
+
+#-----------------------------------------------------------------------------#
+
 # The "var_test" program does not work in ".rt" grades,
 # since it uses the "var" module which does not work in ".rt" grades.
 ifeq "$(findstring .rt,$(GRADE))" ".rt"
@@ -68,10 +73,5 @@
 .PHONY: clean_local
 clean_local:
 	rm -f *.out *.res
-
-#-----------------------------------------------------------------------------#
-
-# The Mmake.params file can be used to override definitions in this file
--include ../../Mmake.params
 
 #-----------------------------------------------------------------------------#

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



More information about the reviews mailing list