[m-rev.] trivial diff: fix test diff option handling

Simon Taylor stayl at cs.mu.OZ.AU
Wed Jan 29 19:13:04 AEDT 2003


Estimated hours taken: 0.1
Branches: main

tests/Mmake.common:
	Allow DIFF_OPTS to be overridden in tests/Mmake.params.	

Index: Mmake.common
===================================================================
RCS file: /home/mercury1/repository/tests/Mmake.common,v
retrieving revision 1.40
diff -u -u -r1.40 Mmake.common
--- Mmake.common	21 Jan 2003 06:15:01 -0000	1.40
+++ Mmake.common	29 Jan 2003 06:59:03 -0000
@@ -19,11 +19,6 @@
 
 MAIN_TARGET = runtests
 
--include $(TESTS_DIR)/Mmake.params
-
-# Avoid trying to make this file with `mmc --make' if it doesn't exist.
-$(TESTS_DIR)/Mmake.params: ;
-
 # Set up to test a particular workspace.
 ifdef WORKSPACE
 
@@ -72,6 +67,11 @@
 else
 PARAMS_MSG = in grade $(GRADE)
 endif
+
+-include $(TESTS_DIR)/Mmake.params
+
+# Avoid trying to make this file with `mmc --make' if it doesn't exist.
+$(TESTS_DIR)/Mmake.params: ;
 
 #-----------------------------------------------------------------------------#
 
--------------------------------------------------------------------------
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