diff options
Diffstat (limited to 'testsuite/Makefile.tests')
| -rw-r--r-- | testsuite/Makefile.tests | 127 |
1 files changed, 67 insertions, 60 deletions
diff --git a/testsuite/Makefile.tests b/testsuite/Makefile.tests index 7aaf622..00a4ec8 100644 --- a/testsuite/Makefile.tests +++ b/testsuite/Makefile.tests @@ -4,7 +4,7 @@ SHELL = /bin/sh # These are only fallback values. They are usually overridden by runtest. srcdir = . -SED = ../sed/sed +SED = ./sed/sed TIME= #TIME=time @@ -15,48 +15,55 @@ TR = $(SEDENV_2) tr CMP=cmp RM=rm -f +elide_cr = $(SEDENV_2) $(SED) 's/\r//g' SKIP = :>$@.skip; exit 77 enable sep inclib 8bit 8to7 newjis xabcx dollar noeol bkslashes \ 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 brackets amp-escape:: +y-bracket y-newline y-zero insert brackets amp-escape newline-anchor:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out 0range:: $(SEDENV) $(SED) -s -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out + +zero-anchor:: + $(SEDENV) $(SED) -z -f $(srcdir)/$@.sed \ + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out badenc:: LC_ALL=ru_RU.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out LC_ALL=it_IT.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out LC_ALL=en_US.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out LC_ALL=en_GB.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out # Try with ru_RU.UTF-8. If it is presumably not installed, see if the current # locale is UTF-8 and run it in the current locale. utf8-1 utf8-2 utf8-3 utf8-4:: echo "LC_ALL=ru_RU.UTF-8" \ "$(TIME) $(SED) -f $(srcdir)/$@.sed" \ - "< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out"; \ + "< $(srcdir)/$@.inp | $(elide_cr) > $@.out"; \ LC_ALL=ru_RU.UTF-8 \ $(TIME) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out; \ + < $(srcdir)/$@.inp | $(elide_cr) > $@.out; \ $(CMP) $(srcdir)/$@.good $@.out && exit 0; \ $(CMP) $(srcdir)/$@.inp $@.out || exit 1; \ locale > $@.info 2>/dev/null || { rm $@.info; $(SKIP); }; \ @@ -64,9 +71,9 @@ utf8-1 utf8-2 utf8-3 utf8-4:: case "$$LC_CTYPE" in \ *UTF-8 | *UTF8 | *utf8 | *utf-8) \ echo "$(TIME) $(SED) -f $(srcdir)/$@.sed" \ - " < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out"; \ + " < $(srcdir)/$@.inp | $(elide_cr) > $@.out"; \ $(TIME) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out; \ + < $(srcdir)/$@.inp | $(elide_cr) > $@.out; \ $(CMP) $(srcdir)/$@.good $@.out && exit 0; \ $(CMP) $(srcdir)/$@.inp $@.out || exit 1 ;; \ *) ;; \ @@ -76,60 +83,60 @@ 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 \ - | $(TR) -d \\r > $@.1out + | $(elide_cr) > $@.1out $(SEDENV) cat $(srcdir)/numsub.inp \ - | ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) | $(TR) -d \\r > $@.2out - $(CMP) $@.1out $@.2out - @$(RM) $@.1out $@.2out + | ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) | $(elide_cr) > $@.2out + $(CMP) $@.1out $@.2out + @$(RM) $@.1out $@.2out inplace-hold:: echo x > $@.1out echo y > $@.2out echo > $@.out - $(SEDENV) $(SED) -i x $@.1out $@.2out - $(CMP) $@.1out $@.out - $(CMP) $@.2out $@.out + $(SEDENV) $(SED) -i x $@.1out $@.2out + $(CMP) $@.1out $@.out + $(CMP) $@.2out $@.out @$(RM) $@.1out $@.2out $@.out cv-vars classes middle dc distrib factor numsub2 numsub3 numsub4 numsub5 \ insens:: $(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out noeolw:: $(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \ - $(srcdir)/noeol.inp $(srcdir)/noeol.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - $(TR) -d \\r < $@.1out | $(CMP) $(srcdir)/$@.1good - - $(TR) -d \\r < $@.2out | $(CMP) $(srcdir)/$@.2good - + $(srcdir)/noeol.inp $(srcdir)/noeol.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + $(elide_cr) < $@.1out | $(CMP) $(srcdir)/$@.1good - + $(elide_cr) < $@.2out | $(CMP) $(srcdir)/$@.2good - @$(RM) $@.1out $@.2out $@.out subwrite:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out + < $(srcdir)/$@.inp | $(elide_cr) > $@.1out $(CMP) $(srcdir)/subwrt1.good $@.1out - $(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/subwrt2.good - + $(elide_cr) < $@.wout | $(CMP) $(srcdir)/subwrt2.good - @$(RM) $@.1out $@.wout bsd:: $(SEDENV_2) sh $(srcdir)/$@.sh '$(TIME) $(SED)' $@.out - $(TR) -d \\r < $@.out | $(CMP) $(srcdir)/$@.good - - @$(RM) $@.out + $(elide_cr) < $@.out | $(CMP) $(srcdir)/$@.good - + @$(RM) $@.out writeout:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out - $(CMP) $(srcdir)/wrtout1.good $@.1out - $(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/wrtout2.good - + < $(srcdir)/$@.inp | $(elide_cr) > $@.1out + $(CMP) $(srcdir)/wrtout1.good $@.1out + $(elide_cr) < $@.wout | $(CMP) $(srcdir)/wrtout2.good - @$(RM) $@.1out $@.wout readin:: echo MOO | $(SEDENV) $(SED) b > $@.in2 $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out @$(RM) $@.out $@.in2 eval.in2: $(srcdir)/eval.inp @@ -137,15 +144,15 @@ eval.in2: $(srcdir)/eval.inp eval:: eval.in2 $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out binary binary2 binary3:: $(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \ - < $(srcdir)/binary.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/binary.good $@.out - @$(RM) $@.out + < $(srcdir)/binary.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/binary.good $@.out + @$(RM) $@.out # # cmdlines targets @@ -153,27 +160,27 @@ binary binary2 binary3:: help:: $(SEDENV) $(SED) --help | grep E-mail > /dev/null 2>&1 - $(SEDENV) $(SED) --help | $(SEDENV) $(SED) '1s/ [^ ]* / sed /; /^E-mail/,$$d' > $@.1out + $(SEDENV) $(SED) --help | $(SEDENV) $(SED) '1s/ [^ ]* / sed /; /^E-mail/,$$d' > $@.1out $(SEDENV) $(SED) 2>&1 | $(SEDENV) $(SED) '1s/ [^ ]* / sed /' > $@.2out || : - $(CMP) $@.1out $@.2out + $(CMP) $@.1out $@.2out @$(RM) $@.1out $@.2out version:: - $(SEDENV) $(SED) --version 2>&1 | $(TR) -d \\r > $@.out - $(CMP) $@.good $@.out + $(SEDENV) $(SED) --version 2>&1 | $(elide_cr) > $@.out + $(CMP) $@.good $@.out @$(RM) $@.out file:: $(SEDENV) $(SED) --file=$(srcdir)/newjis.sed \ - < $(srcdir)/newjis.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/newjis.good $@.out - @$(RM) $@.out + < $(srcdir)/newjis.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/newjis.good $@.out + @$(RM) $@.out quiet:: $(SEDENV) $(SED) --quiet -f $(srcdir)/cv-vars.sed \ - < $(srcdir)/cv-vars.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/cv-vars.good $@.out - @$(RM) $@.out + < $(srcdir)/cv-vars.inp | $(elide_cr) > $@.out + $(CMP) $(srcdir)/cv-vars.good $@.out + @$(RM) $@.out # The following target is not used in super sed builds (only GNU sed) |