Improve support for mingw.

2 files changed, 33 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ba6616..e8d0aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-06  Bruno Haible  <bruno@clisp.org>
+
+	Improve support for mingw.
+	* tests/Makefile.in (check-c, check-ada, check-modula3, check-pascal,
+	check-lang-utf8, check-lang-ucs2): Remove '\r' from output before diff.
+	(POSTPROCESS_FOR_MINGW): New variable.
+	(check-test): Use it to postprocess output before diff.
+
 2007-04-04  Bruno Haible  <bruno@clisp.org>
 
 	Support for newer GNU standards.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ae93897..1f1b317 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for gperf/tests
 
-# Copyright (C) 1989, 1992-1993, 1995, 1998, 2000, 2002-2004 Free Software Foundation, Inc.
+# Copyright (C) 1989, 1992-1993, 1995, 1998, 2000, 2002-2004, 2007 Free Software Foundation, Inc.
 # Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
 # and Bruno Haible <bruno@clisp.org>.
 #
@@ -74,7 +74,7 @@ check-link-c++: force
 
 check-c:
 	@echo "testing ANSI C reserved words, all items should be found in the set"
-	./cout -v < $(srcdir)/c.gperf > c.out
+	./cout -v < $(srcdir)/c.gperf | tr -d '\r' > c.out
 	diff $(srcdir)/c.exp c.out
 
 check-ada:
@@ -82,26 +82,26 @@ check-ada:
 # double '$$' is only there since make gets confused; program wants only 1 '$'
 	$(CC) $(CFLAGS) -o aout adainset.c test.o
 	@echo "testing Ada reserved words, all items should be found in the set"
-	./aout -v < $(srcdir)/ada.gperf > ada-res.out
+	./aout -v < $(srcdir)/ada.gperf | tr -d '\r' > ada-res.out
 	diff $(srcdir)/ada-res.exp ada-res.out
 	$(GPERF) -D -k1,'$$' -s 2 -I -o $(srcdir)/adadefs.gperf > preinset.c
 	$(CC) $(CFLAGS) -o preout preinset.c test.o
 	@echo "testing Ada predefined words, all items should be found in the set"
-	./preout -v < $(srcdir)/adadefs.gperf > ada-pred.out
+	./preout -v < $(srcdir)/adadefs.gperf | tr -d '\r' > ada-pred.out
 	diff $(srcdir)/ada-pred.exp ada-pred.out
 
 check-modula3:
 	$(GPERF) -k1,2,'$$' -I -o $(srcdir)/modula3.gperf > m3inset.c
 	$(CC) $(CFLAGS) -o m3out m3inset.c test.o
 	@echo "testing Modula3 reserved words, all items should be found in the set"
-	./m3out -v < $(srcdir)/modula3.gperf > modula.out
+	./m3out -v < $(srcdir)/modula3.gperf | tr -d '\r' > modula.out
 	diff $(srcdir)/modula.exp modula.out
 
 check-pascal:
 	$(GPERF) -o -S2 -I < $(srcdir)/pascal.gperf > pinset.c
 	$(CC) $(CFLAGS) -o pout pinset.c test.o
 	@echo "testing Pascal reserved words, all items should be found in the set"
-	./pout -v < $(srcdir)/pascal.gperf > pascal.out
+	./pout -v < $(srcdir)/pascal.gperf | tr -d '\r' > pascal.out
 	diff $(srcdir)/pascal.exp pascal.out
 
 # check for 8-bit cleanliness
@@ -109,7 +109,7 @@ check-lang-utf8:
 	$(GPERF) -k1 -t -I -K foreign_name < $(srcdir)/lang-utf8.gperf > lu8inset.c
 	$(CC) $(CFLAGS) -o lu8out lu8inset.c test.o
 	@echo "testing UTF-8 encoded languages, all items should be found in the set"
-	sed -e '1,6d' -e 's/,.*//' < $(srcdir)/lang-utf8.gperf | ./lu8out -v > lang-utf8.out
+	sed -e '1,6d' -e 's/,.*//' < $(srcdir)/lang-utf8.gperf | ./lu8out -v | tr -d '\r' > lang-utf8.out
 	diff $(srcdir)/lang-utf8.exp lang-utf8.out
 
 # check for binary keywords with NUL bytes
@@ -118,7 +118,7 @@ check-lang-ucs2:
 	$(GPERF) -k4 -t -l -I -K foreign_name < $(srcdir)/lang-ucs2.gperf > lu2inset.c
 	$(CC) $(CFLAGS) -o lu2out lu2inset.c test2.o
 	@echo "testing UCS-2 encoded languages, all items should be found in the set"
-	./lu2out -v < $(srcdir)/lang-ucs2.in > lang-ucs2.out
+	./lu2out -v < $(srcdir)/lang-ucs2.in | tr -d '\r' > lang-ucs2.out
 	diff $(srcdir)/lang-ucs2.exp lang-ucs2.out
 
 # check case-insensitive lookup
@@ -135,40 +135,41 @@ check-smtp:
 	./smtp
 
 # these next 5 are demos that show off the generated code
+POSTPROCESS_FOR_MINGW = tr -d '\r' | sed -e 's|[^ ]*[/\\][\\]*src[/\\][\\]*gperf[^ ]*|../src/gperf|'
 check-test:
-	$(GPERF) -L C -F ', 0, 0' -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,'$$' < $(srcdir)/c-parse.gperf > c-parse.out
+	$(GPERF) -L C -F ', 0, 0' -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,'$$' < $(srcdir)/c-parse.gperf | $(POSTPROCESS_FOR_MINGW) > c-parse.out
 	diff $(srcdir)/c-parse.exp c-parse.out
-	$(GPERF) -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,'$$' < $(srcdir)/objc.gperf > objc.out
+	$(GPERF) -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,'$$' < $(srcdir)/objc.gperf | $(POSTPROCESS_FOR_MINGW) > objc.out
 	diff $(srcdir)/objc.exp objc.out
-	$(GPERF) -L C -F ', 0, 0, 0' -D -E -S1 -j1 -i 1 -g -o -t -k'*' < $(srcdir)/chill.gperf > chill.out
+	$(GPERF) -L C -F ', 0, 0, 0' -D -E -S1 -j1 -i 1 -g -o -t -k'*' < $(srcdir)/chill.gperf | $(POSTPROCESS_FOR_MINGW) > chill.out
 	diff $(srcdir)/chill.exp chill.out
-	$(GPERF) -L C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k1,4,7,'$$' < $(srcdir)/cplusplus.gperf > cplusplus.out
+	$(GPERF) -L C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k1,4,7,'$$' < $(srcdir)/cplusplus.gperf | $(POSTPROCESS_FOR_MINGW) > cplusplus.out
 	diff $(srcdir)/cplusplus.exp cplusplus.out
-	$(GPERF) -L C -F ', 0' -t -j1 -i 1 -g -o -N java_keyword -k1,3,'$$' < $(srcdir)/java.gperf > java.out
+	$(GPERF) -L C -F ', 0' -t -j1 -i 1 -g -o -N java_keyword -k1,3,'$$' < $(srcdir)/java.gperf | $(POSTPROCESS_FOR_MINGW) > java.out
 	diff $(srcdir)/java.exp java.out
-	$(GPERF) -n -k1-8 -l < $(srcdir)/modula2.gperf > modula2.out
+	$(GPERF) -n -k1-8 -l < $(srcdir)/modula2.gperf | $(POSTPROCESS_FOR_MINGW) > modula2.out
 	diff $(srcdir)/modula2.exp modula2.out
-	$(GPERF) -D -t -k1,'$$' < $(srcdir)/c-parse.gperf > test-4.out
+	$(GPERF) -D -t -k1,'$$' < $(srcdir)/c-parse.gperf | $(POSTPROCESS_FOR_MINGW) > test-4.out
 	diff $(srcdir)/test-4.exp test-4.out
-	$(GPERF) -g -o -j1 -t -N is_reserved_word < $(srcdir)/gpc.gperf > gpc.out
+	$(GPERF) -g -o -j1 -t -N is_reserved_word < $(srcdir)/gpc.gperf | $(POSTPROCESS_FOR_MINGW) > gpc.out
 	diff $(srcdir)/gpc.exp gpc.out
-	$(GPERF) -m5 < $(srcdir)/permut2.gperf > permut2.out
+	$(GPERF) -m5 < $(srcdir)/permut2.gperf | $(POSTPROCESS_FOR_MINGW) > permut2.out
 	diff $(srcdir)/permut2.exp permut2.out
-	$(GPERF) -m5 < $(srcdir)/permut3.gperf > permut3.out
+	$(GPERF) -m5 < $(srcdir)/permut3.gperf | $(POSTPROCESS_FOR_MINGW) > permut3.out
 	diff $(srcdir)/permut3.exp permut3.out
-	$(GPERF) -m5 --ignore-case < $(srcdir)/permutc2.gperf > permutc2.out
+	$(GPERF) -m5 --ignore-case < $(srcdir)/permutc2.gperf | $(POSTPROCESS_FOR_MINGW) > permutc2.out
 	diff $(srcdir)/permutc2.exp permutc2.out
-	$(GPERF) -C -E -G -I -t < $(srcdir)/charsets.gperf > charsets.out
+	$(GPERF) -C -E -G -I -t < $(srcdir)/charsets.gperf | $(POSTPROCESS_FOR_MINGW) > charsets.out
 	diff $(srcdir)/charsets.exp charsets.out
-	$(GPERF) -C -E -G -I -t < $(srcdir)/languages.gperf > languages.out
+	$(GPERF) -C -E -G -I -t < $(srcdir)/languages.gperf | $(POSTPROCESS_FOR_MINGW) > languages.out
 	diff $(srcdir)/languages.exp languages.out
-	$(GPERF) -t < $(srcdir)/incomplete.gperf > incomplete.out
+	$(GPERF) -t < $(srcdir)/incomplete.gperf | $(POSTPROCESS_FOR_MINGW) > incomplete.out
 	diff $(srcdir)/incomplete.exp incomplete.out
 # prints out the help message
-	-$(GPERF) -h > test-6.out
+	-$(GPERF) -h | $(POSTPROCESS_FOR_MINGW) > test-6.out
 	diff $(srcdir)/test-6.exp test-6.out
 	@echo "only if, do, for, case, goto, else, while, and return should be found "
-	./aout -v < $(srcdir)/c.gperf > test-7.out
+	./aout -v < $(srcdir)/c.gperf | $(POSTPROCESS_FOR_MINGW) > test-7.out
 	diff $(srcdir)/test-7.exp test-7.out
 
 # The following validates valid language syntax with different parameters.