[m-rev.] diff: fix string_format test problems under cygwin

[Peter Ross]

Hi,


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


Estimated hours taken: 0.25
Branches: main

Fix a problem with the tests on a text mount under cygwin.  For some
unknown reason, the .sorted_out file produced contains ^M's when using
mmake.  They don't occur when creating the output from the shell prompt.

tests/general/string_format/Mmakefile:
	Use sed to remove any ^M at the end of lines when producing
	the .sorted_out file.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/general/string_format/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- Mmakefile	28 Nov 2002 09:13:36 -0000	1.7
+++ Mmakefile	2 Dec 2002 12:33:53 -0000
@@ -76,7 +76,7 @@
 	@echo "Comparing $*.sorted_out with $*.exp*,"
 	@echo "	results in $@"
 	@-rm -f $@ $*.res[1-5]
-	@cat $*.out | sort > $*.sorted_out
+	@cat $*.out | sort | sed -e 's/
$$//g' > $*.sorted_out
 	@{ diff $(DIFF_OPTS) $*.exp $*.sorted_out > $*.res1 && \
 		echo "Matched $*.exp" && \
 		cp $*.res1 $@; } || \

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