[m-rev.] trivial diff: s/diff -c/diff $(DIFF_OPTS)/

[Fergus Henderson]

Estimated hours taken: 0.1
Branches: main

tests/warnings/Mmakefile:
tests/term/Mmakefile:
	Use DIFF_OPTS rather than hard-coding `-c'.

Workspace: /home/ceres/fjh/ws-gcc-basic-improvements-patched/mercury
Index: tests/term/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/term/Mmakefile,v
retrieving revision 1.17
diff -u -d -p -r1.17 Mmakefile
--- tests/term/Mmakefile	17 Aug 2002 13:52:29 -0000	1.17
+++ tests/term/Mmakefile	20 Sep 2002 09:39:19 -0000
@@ -91,7 +91,8 @@ MCTRANSOPTFLAGS = $(MCTERMFLAGS) $(MCOPT
 ALL_MCTOIFLAGS+=$(MCTRANSOPTFLAGS)
 
 %.trans_opt_res: %.trans_opt_exp $(trans_opts_subdir)%.trans_opt
-	diff -c $*.trans_opt_exp $(trans_opts_subdir)$*.trans_opt > $@
+	diff $(DIFF_OPTS) $*.trans_opt_exp $(trans_opts_subdir)$*.trans_opt \
+		> $@
 
 #-----------------------------------------------------------------------------#
 
Index: tests/warnings/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/warnings/Mmakefile,v
retrieving revision 1.22
diff -u -d -p -r1.22 Mmakefile
--- tests/warnings/Mmakefile	17 Aug 2002 13:52:33 -0000	1.22
+++ tests/warnings/Mmakefile	20 Sep 2002 09:37:42 -0000
@@ -46,11 +46,11 @@ $(ERRORCHECK_PROGS:%=%.runtest): %.runte
 
 %.res_error:	%.exp %.err
 	-rm -f $@
-	diff -c $*.exp $*.err > $@ || { cat $@ && exit 1; }
+	diff $(DIFF_OPTS) $*.exp $*.err > $@ || { cat $@ && exit 1; }
 
 %.res_compile:	%.exp %.c
 	-rm -f $@
-	diff -c $*.exp $*.err > $@ || { cat $@ && exit 1; }
+	diff $(DIFF_OPTS) $*.exp $*.err > $@ || { cat $@ && exit 1; }
 
 ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 %.c: %.m

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