handle CRLF endings in the testsuite for mingw

2009-04-27  Paolo Bonzini  <bonzini@gnu.org>

	* testsuite/Makefile.tests: Handle CRLF endings for mingw.
This commit is contained in:
Paolo Bonzini committed 2009-04-27 11:36:12 +02:00
1 parent 8172184989
commit f7e125b54d
2 files changed
+54 -34

No files matched your search

+4
View File
@@ -1,3 +1,7 @@
2009-04-27 Paolo Bonzini <bonzini@gnu.org>
* testsuite/Makefile.tests: Handle CRLF endings for mingw.
2009-04-27 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Link readin.in2 into builddir.
+50 -34
View File
@@ -5,10 +5,13 @@ SHELL = /bin/sh
# These are only fallback values. They are usually overridden by runtest.
srcdir = .
SED = ../sed/sed
SEDENV = LC_ALL=C $(TIME)
#TIME=time
TIME=
#TIME=time
SEDENV_2 = LC_ALL=C
SEDENV = $(SEDENV_2) $(TIME)
TR = $(SEDENV_2) tr
CMP=cmp
RM=rm -f
@@ -20,27 +23,28 @@ numsub head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \
appquit fasts uniq manis linecnt khadafy allsub flipcase space modulo \
y-bracket y-newline insert::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp > $@.out
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out
0range::
$(SEDENV) $(SED) -s -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out
$(SEDENV) $(SED) -s -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out
badenc::
LANG=ru_RU.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \
< $(srcdir)/$@.inp > $@.out
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
LANG=it_IT.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \
< $(srcdir)/$@.inp > $@.out
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
LANG=en_US.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \
< $(srcdir)/$@.inp > $@.out
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
LANG=en_GB.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \
< $(srcdir)/$@.inp > $@.out
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out
@@ -48,17 +52,21 @@ badenc::
# locale is UTF-8 and run it in the current locale.
utf8-1 utf8-2 utf8-3 utf8-4::
echo "LANG=ru_RU.UTF-8" \
"$(TIME) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out"; \
"$(TIME) $(SED) -f $(srcdir)/$@.sed" \
"< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out"; \
LANG=ru_RU.UTF-8 \
$(TIME) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out; \
$(TIME) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out; \
$(CMP) $(srcdir)/$@.good $@.out && exit 0; \
$(CMP) $(srcdir)/$@.inp $@.out || exit 1; \
locale > $@.info 2>/dev/null || { rm $@.info; $(SKIP); }; \
. $@.info; rm $@.info; \
case "$$LC_CTYPE" in \
*UTF-8 | *UTF8 | *utf8 | *utf-8) \
echo "$(TIME) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out"; \
$(TIME) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out; \
echo "$(TIME) $(SED) -f $(srcdir)/$@.sed" \
" < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out"; \
$(TIME) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out; \
$(CMP) $(srcdir)/$@.good $@.out && exit 0; \
$(CMP) $(srcdir)/$@.inp $@.out || exit 1 ;; \
*) ;; \
@@ -67,8 +75,10 @@ utf8-1 utf8-2 utf8-3 utf8-4::
# This checks for a bug in 3.02 and 3.02.80
stdin::
($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) < $(srcdir)/numsub.inp > $@.1out
$(SEDENV) cat $(srcdir)/numsub.inp | ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) > $@.2out
($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) < $(srcdir)/numsub.inp \
| $(TR) -d \\r > $@.1out
$(SEDENV) cat $(srcdir)/numsub.inp \
| ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) | $(TR) -d \\r > $@.2out
$(CMP) $@.1out $@.2out
@$(RM) $@.1out $@.2out
@@ -83,37 +93,41 @@ inplace-hold::
cv-vars classes middle dc distrib factor numsub2 numsub3 numsub4 numsub5 \
insens::
$(SEDENV) $(SED) -n -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out
$(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out
noeolw::
$(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \
$(srcdir)/noeol.inp $(srcdir)/noeol.inp > $@.out
$(srcdir)/noeol.inp $(srcdir)/noeol.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
$(CMP) $(srcdir)/$@.1good $@.1out
$(CMP) $(srcdir)/$@.2good $@.2out
$(TR) -d \\r < $@.1out | $(CMP) $(srcdir)/$@.1good -
$(TR) -d \\r < $@.2out | $(CMP) $(srcdir)/$@.2good -
@$(RM) $@.1out $@.2out $@.out
subwrite::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.1out
$(CMP) $(srcdir)/subwrt1.good $@.1out
$(CMP) $(srcdir)/subwrt2.good $@.wout
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out
$(CMP) $(srcdir)/subwrt1.good $@.1out
$(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/subwrt2.good -
@$(RM) $@.1out $@.wout
bsd::
$(SEDENV) sh $(srcdir)/$@.sh '$(SED)' bsd.out
$(CMP) $(srcdir)/$@.good $@.out
$(SEDENV_2) sh $(srcdir)/$@.sh '$(TIME) $(SED)' $@.out
$(TR) -d \\r < $@.out | $(CMP) $(srcdir)/$@.good -
@$(RM) $@.out
writeout::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp >$@.1out
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out
$(CMP) $(srcdir)/wrtout1.good $@.1out
$(CMP) $(srcdir)/wrtout2.good $@.wout
$(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/wrtout2.good -
@$(RM) $@.1out $@.wout
readin::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp >$@.out
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out
@@ -121,12 +135,14 @@ eval.in2: $(srcdir)/eval.inp
cat $(srcdir)/eval.inp > $@
eval:: eval.in2
$(SEDENV) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out
binary binary2 binary3::
$(SEDENV) $(SED) -n -f $(srcdir)/$@.sed < $(srcdir)/binary.inp >$@.out
$(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \
< $(srcdir)/binary.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/binary.good $@.out
@$(RM) $@.out
@@ -135,26 +151,26 @@ binary binary2 binary3::
#
help::
$(SED) --help | grep E-mail > /dev/null 2>&1
$(SED) --help | $(SED) '1s/ [^ ]* / sed /; /^E-mail/,$$d' > $@.1out
$(SED) 2>&1 | $(SED) '1s/ [^ ]* / sed /' > $@.2out || :
$(SEDENV) $(SED) --help | grep E-mail > /dev/null 2>&1
$(SEDENV) $(SED) --help | $(SEDENV) $(SED) '1s/ [^ ]* / sed /; /^E-mail/,$$d' > $@.1out
$(SEDENV) $(SED) 2>&1 | $(SEDENV) $(SED) '1s/ [^ ]* / sed /' > $@.2out || :
$(CMP) $@.1out $@.2out
@$(RM) $@.1out $@.2out
version::
$(SEDENV) $(SED) --version > $@.out 2>&1
$(SEDENV) $(SED) --version 2>&1 | $(TR) -d \\r > $@.out
$(CMP) $@.good $@.out
@$(RM) $@.out
file::
$(SEDENV) $(SED) --file=$(srcdir)/newjis.sed \
< $(srcdir)/newjis.inp > $@.out
< $(srcdir)/newjis.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/newjis.good $@.out
@$(RM) $@.out
quiet::
$(SEDENV) $(SED) --quiet -f $(srcdir)/cv-vars.sed \
< $(srcdir)/cv-vars.inp > $@.out
< $(srcdir)/cv-vars.inp | $(TR) -d \\r > $@.out
$(CMP) $(srcdir)/cv-vars.good $@.out
@$(RM) $@.out