[m-dev.] diff: tests/general working under windows

[Peter Ross]

Hi,


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


Estimated hours taken: 0.5

tests/general/Mmakefile:
	If we are compiling in the grade hl* disable the univ test as
	unification of univ values are not yet supported.
	Strip any carriage returns from the string_format_test_* output.
	This is needed when running the tests under windows.


Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/general/Mmakefile,v
retrieving revision 1.29
diff -u -r1.29 Mmakefile
--- Mmakefile	2000/04/05 06:11:32	1.29
+++ Mmakefile	2000/08/10 10:30:49
@@ -63,9 +63,14 @@
 		string_format_test_3 \
 		string_test \
 		string_test_2 \
-		univ \
 		unreachable 
 
+# univ.m does not work in the hlc.* grades because unification of univ
+# values is not yet implemented.
+ifeq "$(findstring hl,$(GRADE))" ""
+	PROGS+= univ
+endif
+
 # dnf.m does not work in non-gc grades, because it uses `pragma memo'
 # (i.e. tabling) and tabling is not yet implemented for non-gc grades.
 NOT_WORKING =	dnf
@@ -104,7 +109,7 @@
 		    -e 's/string.m:[0-9]*/string.m:NNNN/g' \
 		    -e 's/require.m:[0-9]*/require.m:NNNN/g' \
 		    -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \
-		> string_format_test_2.out
+		| tr -d '\r' > string_format_test_2.out
 		
 string_format_test_3.out: string_format_test_3
 	-./string_format_test_3 2>&1 | \
@@ -112,7 +117,7 @@
 		    -e 's/string.m:[0-9]*/string.m:NNNN/g' \
 		    -e 's/require.m:[0-9]*/require.m:NNNN/g' \
 		    -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \
-		> string_format_test_3.out
+		| tr -d '\r' > string_format_test_3.out
 
 #-----------------------------------------------------------------------------#
 

--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------