summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/8bit.sed2
-rw-r--r--testsuite/BOOST.tests28
-rw-r--r--testsuite/Makefile.tests96
-rw-r--r--testsuite/PCRE.tests178
-rw-r--r--testsuite/badenc.sed2
-rw-r--r--testsuite/binary.sed8
-rw-r--r--testsuite/binary2.sed8
-rw-r--r--testsuite/binary3.sed8
-rw-r--r--testsuite/distrib.sh2
-rw-r--r--testsuite/eval.good12
-rw-r--r--testsuite/eval.inp4
-rw-r--r--testsuite/inclib.good68
-rw-r--r--testsuite/inclib.inp68
-rw-r--r--testsuite/khadafy.good2
-rw-r--r--testsuite/khadafy.inp2
-rw-r--r--testsuite/linecnt.good4
-rw-r--r--testsuite/linecnt.inp4
-rw-r--r--testsuite/mac-mf.good54
-rw-r--r--testsuite/mac-mf.inp36
-rw-r--r--testsuite/mac-mf.sed3
-rw-r--r--testsuite/manis.sed4
-rw-r--r--testsuite/tst-pcre.c2
-rw-r--r--testsuite/uniq.good2
-rw-r--r--testsuite/uniq.inp4
-rw-r--r--testsuite/y-bracket.good2
-rw-r--r--testsuite/y-bracket.inp2
-rw-r--r--testsuite/y-newline.good2
-rw-r--r--testsuite/y-newline.inp2
28 files changed, 305 insertions, 304 deletions
diff --git a/testsuite/8bit.sed b/testsuite/8bit.sed
index 7b3ed8d..37c0624 100644
--- a/testsuite/8bit.sed
+++ b/testsuite/8bit.sed
@@ -16,6 +16,6 @@
# Oh, well I remember
# How on such a day we used to meet--
# My lover and I!
-# -- Kakinomoto Hitomaro
+# -- Kakinomoto Hitomaro
#
s/ÂçÏÂ/ÆüËÜ/
diff --git a/testsuite/BOOST.tests b/testsuite/BOOST.tests
index 98fd3b6..aa57489 100644
--- a/testsuite/BOOST.tests
+++ b/testsuite/BOOST.tests
@@ -1,5 +1,5 @@
-;
-;
+;
+;
; this file contains a script of tests to run through regress.exe
;
; comments start with a semicolon and proceed to the end of the line
@@ -289,7 +289,7 @@ a((b)*\2)*d abbbd 0 5 1 4 2 3
(a)\1bc*[ce]d aabcccd 0 7 0 1
^(a)\1b(c)*cd$ aabcccd 0 7 0 1 4 5
-; posix only:
+; posix only:
- match_default extended REG_EXTENDED
(ab*)[ab]*\1 ababaaa 0 7 0 1
@@ -391,11 +391,11 @@ a(b*|c|e)d ad 0 2 1 1
a(b?)c abc 0 3 1 2
a(b?)c ac 0 2 1 1
a(b+)c abc 0 3 1 2
-a(b+)c abbbc 0 5 1 4
-a(b*)c ac 0 2 1 1
+a(b+)c abbbc 0 5 1 4
+a(b*)c ac 0 2 1 1
(a|ab)(bc([de]+)f|cde) abcdef 0 6 0 1 1 6 3 5
a([bc]?)c abc 0 3 1 2
-a([bc]?)c ac 0 2 1 1
+a([bc]?)c ac 0 2 1 1
a([bc]+)c abc 0 3 1 2
a([bc]+)c abcc 0 4 1 3
a([bc]+)bc abcbc 0 5 1 3
@@ -774,13 +774,13 @@ a()b\1 ab 0 2 1 1
; subtleties of matching with no sub-expressions marked
- normal match_nosubs REG_NO_POSIX_TEST
-a(b?c)+d accd 0 4
-(wee|week)(knights|night) weeknights 0 10
+a(b?c)+d accd 0 4
+(wee|week)(knights|night) weeknights 0 10
.* abc 0 3
-a(b|(c))d abd 0 3
+a(b|(c))d abd 0 3
a(b|(c))d acd 0 3
a(b*|c|e)d abbd 0 4
-a(b*|c|e)d acd 0 3
+a(b*|c|e)d acd 0 3
a(b*|c|e)d ad 0 2
a(b?)c abc 0 3
a(b?)c ac 0 2
@@ -801,13 +801,13 @@ a(bbb+|bb+|b)bb abbb 0 4
(a*)* bc 0 0
- normal nosubs REG_NO_POSIX_TEST
-a(b?c)+d accd 0 4
-(wee|week)(knights|night) weeknights 0 10
+a(b?c)+d accd 0 4
+(wee|week)(knights|night) weeknights 0 10
.* abc 0 3
-a(b|(c))d abd 0 3
+a(b|(c))d abd 0 3
a(b|(c))d acd 0 3
a(b*|c|e)d abbd 0 4
-a(b*|c|e)d acd 0 3
+a(b*|c|e)d acd 0 3
a(b*|c|e)d ad 0 2
a(b?)c abc 0 3
a(b?)c ac 0 2
diff --git a/testsuite/Makefile.tests b/testsuite/Makefile.tests
index 68fd077..7f50f50 100644
--- a/testsuite/Makefile.tests
+++ b/testsuite/Makefile.tests
@@ -23,30 +23,30 @@ 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 y-zero insert brackets amp-escape::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
- < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
- $(CMP) $(srcdir)/$@.good $@.out
- @$(RM) $@.out
+ < $(srcdir)/$@.inp | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.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.
@@ -76,39 +76,39 @@ 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
+ | $(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
+ | ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.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
+ $(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 -
@$(RM) $@.1out $@.2out $@.out
subwrite::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
- < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out
+ < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out
$(CMP) $(srcdir)/subwrt1.good $@.1out
$(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/subwrt2.good -
@$(RM) $@.1out $@.wout
@@ -116,20 +116,20 @@ subwrite::
bsd::
$(SEDENV_2) sh $(srcdir)/$@.sh '$(TIME) $(SED)' $@.out
$(TR) -d \\r < $@.out | $(CMP) $(srcdir)/$@.good -
- @$(RM) $@.out
+ @$(RM) $@.out
writeout::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
- < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out
- $(CMP) $(srcdir)/wrtout1.good $@.1out
+ < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out
+ $(CMP) $(srcdir)/wrtout1.good $@.1out
$(TR) -d \\r < $@.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 | $(TR) -d \\r > $@.out
+ $(CMP) $(srcdir)/$@.good $@.out
@$(RM) $@.out $@.in2
eval.in2: $(srcdir)/eval.inp
@@ -137,15 +137,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 | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.out
+ $(CMP) $(srcdir)/binary.good $@.out
+ @$(RM) $@.out
#
# cmdlines targets
@@ -153,27 +153,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
+ $(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 | $(TR) -d \\r > $@.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 | $(TR) -d \\r > $@.out
+ $(CMP) $(srcdir)/cv-vars.good $@.out
+ @$(RM) $@.out
# The following target is not used in super sed builds (only GNU sed)
diff --git a/testsuite/PCRE.tests b/testsuite/PCRE.tests
index 0fb9cad..7816dce 100644
--- a/testsuite/PCRE.tests
+++ b/testsuite/PCRE.tests
@@ -552,21 +552,21 @@ No match
1: cataract
2: aract
3: ract
- 4:
+ 4:
5: 3
catatonic catatonic23
0: catatonic catatonic23
1: catatonic
2: atonic
3: tonic
- 4:
+ 4:
5: 3
caterpillar caterpillar23
0: caterpillar caterpillar23
1: caterpillar
2: erpillar
3: <unset>
- 4:
+ 4:
5: 3
@@ -578,10 +578,10 @@ No match
/^From\s+\S+\s+([a-zA-Z]{3}\s+){2}[0-9]{1,2}\s+[0-9][0-9]:[0-9][0-9]/
From abcd Mon Sep 01 12:33:02 1997
0: From abcd Mon Sep 01 12:33
- 1: Sep
+ 1: Sep
From abcd Mon Sep 1 12:33:02 1997
0: From abcd Mon Sep 1 12:33
- 1: Sep
+ 1: Sep
*** Failers
No match
From abcd Sep 01 12:33:02 1997
@@ -617,7 +617,7 @@ No match
2: bell
bell
0: bell
- 1:
+ 1:
2: bell
*** Failers
No match
@@ -633,7 +633,7 @@ No match
1: a
b
0: b
- 1:
+ 1:
*** Failers
No match
ab
@@ -645,7 +645,7 @@ No match
1: a
b
0: b
- 1:
+ 1:
*** Failers
No match
ab
@@ -664,7 +664,7 @@ No match
1: a
b
0: b
- 1:
+ 1:
*** Failers
No match
ab
@@ -781,7 +781,7 @@ No match
0: baccc
1: b
2: a
- 3:
+ 3:
4: ccc
*** Failers
0: *** Failers
@@ -799,7 +799,7 @@ No match
0: A
/[^a]/i
- Abc
+ Abc
0: b
/[^a]+/
@@ -831,7 +831,7 @@ No match
No match
akb
No match
- akk
+ akk
No match
/^[0-9]{8,}@.+[^k]$/
@@ -843,7 +843,7 @@ No match
No match
12345678@x.y.uk
No match
- 1234567@a.b.c.d
+ 1234567@a.b.c.d
No match
/(a)\1{8,}/
@@ -855,31 +855,31 @@ No match
1: a
*** Failers
No match
- aaaaaaa
+ aaaaaaa
No match
/[^a]/
aaaabcd
0: b
- aaAabcd
+ aaAabcd
0: A
/[^a]/i
aaaabcd
0: b
- aaAabcd
+ aaAabcd
0: b
/[^az]/
aaaabcd
0: b
- aaAabcd
+ aaAabcd
0: A
/[^az]/i
aaaabcd
0: b
- aaAabcd
+ aaAabcd
0: b
/P[^*]TAIRE[^*]{1,6}LL/
@@ -894,30 +894,30 @@ No match
1.230003938
0: .230003938
1: .23
- 1.875000282
+ 1.875000282
0: .875000282
1: .875
- 1.235
+ 1.235
0: .235
1: .23
-
+
/\b(foo)\s+(\w+)/i
Food is on the foo table
0: foo table
1: foo
2: table
-
+
/foo(.*)bar/
The food is under the bar in the barn.
0: food is under the bar in the bar
- 1: d is under the bar in the
-
+ 1: d is under the bar in the
+
/(.*)([0-9]*)/
I have 2 numbers: 53147
0: I have 2 numbers: 53147
1: I have 2 numbers: 53147
- 2:
-
+ 2:
+
/(.*)([0-9]+)/
I have 2 numbers: 53147
0: I have 2 numbers: 53147
@@ -933,13 +933,13 @@ No match
/(.*)\b([0-9]+)$/
I have 2 numbers: 53147
0: I have 2 numbers: 53147
- 1: I have 2 numbers:
+ 1: I have 2 numbers:
2: 53147
/(.*[^0-9])([0-9]+)$/
I have 2 numbers: 53147
0: I have 2 numbers: 53147
- 1: I have 2 numbers:
+ 1: I have 2 numbers:
2: 53147
/[[:digit:]][[:digit:]]\/[[:digit:]][[:digit:]]\/[[:digit:]][[:digit:]][[:digit:]][[:digit:]]/
@@ -948,48 +948,48 @@ No match
/^(a){0,0}/
bcd
- 0:
+ 0:
abc
- 0:
- aab
- 0:
+ 0:
+ aab
+ 0:
/^(a){0,1}/
bcd
- 0:
+ 0:
abc
0: a
1: a
- aab
+ aab
0: a
1: a
/^(a){0,2}/
bcd
- 0:
+ 0:
abc
0: a
1: a
- aab
+ aab
0: aa
1: a
/^(a){0,3}/
bcd
- 0:
+ 0:
abc
0: a
1: a
aab
0: aa
1: a
- aaa
+ aaa
0: aaa
1: a
/^(a){0,}/
bcd
- 0:
+ 0:
abc
0: a
1: a
@@ -999,7 +999,7 @@ No match
aaa
0: aaa
1: a
- aaaaaaaa
+ aaaaaaaa
0: aaaaaaaa
1: a
@@ -1009,7 +1009,7 @@ No match
abc
0: a
1: a
- aab
+ aab
0: a
1: a
@@ -1019,7 +1019,7 @@ No match
abc
0: a
1: a
- aab
+ aab
0: aa
1: a
@@ -1032,7 +1032,7 @@ No match
aab
0: aa
1: a
- aaa
+ aaa
0: aaa
1: a
@@ -1048,7 +1048,7 @@ No match
aaa
0: aaa
1: a
- aaaaaaaa
+ aaaaaaaa
0: aaaaaaaa
1: a
@@ -1057,28 +1057,28 @@ No match
0: 123456654321
/^[[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]]/
- 123456654321
+ 123456654321
0: 123456654321
/^[abc]{12}/
abcabcabcabc
0: abcabcabcabc
-
+
/^[a-c]{12}/
abcabcabcabc
0: abcabcabcabc
-
+
/^(a|b|c){12}/
- abcabcabcabc
+ abcabcabcabc
0: abcabcabcabc
1: c
/^[abcdefghijklmnopqrstuvwxy0123456789]/
n
0: n
- *** Failers
+ *** Failers
No match
- z
+ z
No match
/abcde{0,0}/
@@ -1086,7 +1086,7 @@ No match
0: abcd
*** Failers
No match
- abce
+ abce
No match
/ab[cd]{0,0}e/
@@ -1094,21 +1094,21 @@ No match
0: abe
*** Failers
No match
- abcde
+ abcde
No match
-
+
/ab(c){0,0}d/
abd
0: abd
*** Failers
No match
- abcd
+ abcd
No match
/a(b*)/
a
0: a
- 1:
+ 1:
ab
0: ab
1: b
@@ -1117,33 +1117,33 @@ No match
1: bbbb
*** Failers
0: a
- 1:
- bbbbb
+ 1:
+ bbbbb
No match
-
+
/ab[0-9]{0}e/
abe
0: abe
*** Failers
No match
- ab1e
+ ab1e
No match
-
+
/(A|B)*CD/
- CD
+ CD
0: CD
/(AB)*\1/
ABABAB
0: ABABAB
1: AB
-
+
/([0-9]+)(\w)/
12345a
0: 12345a
1: 12345
2: a
- 12345+
+ 12345+
0: 12345
1: 1234
2: 5
@@ -1158,15 +1158,15 @@ No match
abcabcabc
0: abcabcabc
1: abc
- xyz
- 0:
- 1:
+ xyz
+ 0:
+ 1:
/([a]*)*/
a
0: a
1: a
- aaaaa
+ aaaaa
0: aaaaa
1: aaaaa
@@ -1183,7 +1183,7 @@ No match
aaaabcde
0: aaaab
1: aaaab
- bbbb
+ bbbb
0: bbbb
1: bbbb
@@ -1194,15 +1194,15 @@ No match
bbbb
0: bbbb
1: bbbb
- aaa
- 0:
+ aaa
+ 0:
/([^ab]*)*/
cccc
0: cccc
1: cccc
- abab
- 0:
+ abab
+ 0:
/abc/
abc
@@ -1322,11 +1322,11 @@ No match
/^/
abc
- 0:
+ 0:
/$/
abc
- 0:
+ 0:
/a.c/
abc
@@ -1483,7 +1483,7 @@ No match
/()ef/
def
0: ef
- 1:
+ 1:
/a\(b/
a(b
@@ -1554,10 +1554,10 @@ No match
No match
b
No match
-
+
/a*/
-
+
/([abc])*d/
abbbcd
@@ -1600,7 +1600,7 @@ No match
/(abc|)ef/
abcdef
0: ef
- 1:
+ 1:
/(a|b)c*d/
abcd
@@ -1847,11 +1847,11 @@ No match
/^/i
ABC
- 0:
+ 0:
/$/i
ABC
- 0:
+ 0:
/a.c/i
ABC
@@ -1924,7 +1924,7 @@ No match
/()ef/i
DEF
0: EF
- 1:
+ 1:
/$b/i
*** Failers
@@ -2043,7 +2043,7 @@ No match
/(abc|)ef/i
ABCDEF
0: EF
- 1:
+ 1:
/(a|b)c*d/i
ABCD
@@ -2236,8 +2236,8 @@ No match
/^(){3,5}/
abc
- 0:
- 1:
+ 0:
+ 1:
/^(a+)*ax/
aax
@@ -2339,20 +2339,20 @@ No match
ZABCDEFG
0: ZA
1: A
- 2:
+ 2:
/(Z(())|A)*/
ZABCDEFG
0: ZA
1: A
- 2:
- 3:
+ 2:
+ 3:
/(.*)[0-9]+\1/
abc123abc
0: abc123abc
1: abc
- abc123bc
+ abc123bc
0: bc123bc
1: bc
@@ -2361,7 +2361,7 @@ No match
0: abc123abc
1: abc
2: abc
- abc123bc
+ abc123bc
0: bc123bc
1: bc
2: bc
diff --git a/testsuite/badenc.sed b/testsuite/badenc.sed
index dc80982..c46bb69 100644
--- a/testsuite/badenc.sed
+++ b/testsuite/badenc.sed
@@ -1 +1 @@
-/.*/ { H ; g ; s/\n// ; p ; z ; x }
+/.*/ { H ; g ; s/\n// ; p ; z ; x }
diff --git a/testsuite/binary.sed b/testsuite/binary.sed
index 92a6a06..e8ffd3b 100644
--- a/testsuite/binary.sed
+++ b/testsuite/binary.sed
@@ -37,23 +37,23 @@
# 255.255.255.0; 2 parameters => given host address and netmask compute
# network and broadcast addresses):
#
-# if [ $# = 1 ]; then
+# if [ $# = 1 ]; then
# OUTPUT='$1.$2.$3.$4'
# set 255.255.255.255 $1
# else
# OUTPUT='$1.$2.$3.$4 $5.$6.$7.$8'
# fi
-#
+#
# if [ `expr $2 : ".*\\."` -gt 0 ]; then
# MASK="$2 br b8<r b16<r b24< R|R|R|"
# else
# MASK="$2b 31b ^d D
# 11111111111111111111111111111111 x>1> x<1<"
# fi
-#
+#
# set `echo "$1 br b8<r b16<r b24< R|R|R| D # Load address
# $MASK D ~r # Load mask
-#
+#
# & DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP
# | DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP
# " | sed -f binary.sed`
diff --git a/testsuite/binary2.sed b/testsuite/binary2.sed
index daf7706..115b942 100644
--- a/testsuite/binary2.sed
+++ b/testsuite/binary2.sed
@@ -38,23 +38,23 @@
# 255.255.255.0; 2 parameters => given host address and netmask compute
# network and broadcast addresses):
#
-# if [ $# = 1 ]; then
+# if [ $# = 1 ]; then
# OUTPUT='$1.$2.$3.$4'
# set 255.255.255.255 $1
# else
# OUTPUT='$1.$2.$3.$4 $5.$6.$7.$8'
# fi
-#
+#
# if [ `expr $2 : ".*\\."` -gt 0 ]; then
# MASK="$2 br b8<r b16<r b24< R|R|R|"
# else
# MASK="$2b 31b ^d D
# 11111111111111111111111111111111 x>1> x<1<"
# fi
-#
+#
# set `echo "$1 br b8<r b16<r b24< R|R|R| D # Load address
# $MASK D ~r # Load mask
-#
+#
# & DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP
# | DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP
# " | sed -f binary.sed`
diff --git a/testsuite/binary3.sed b/testsuite/binary3.sed
index b877f14..ba6b7d1 100644
--- a/testsuite/binary3.sed
+++ b/testsuite/binary3.sed
@@ -41,23 +41,23 @@
# 255.255.255.0; 2 parameters => given host address and netmask compute
# network and broadcast addresses):
#
-# if [ $# = 1 ]; then
+# if [ $# = 1 ]; then
# OUTPUT='$1.$2.$3.$4'
# set 255.255.255.255 $1
# else
# OUTPUT='$1.$2.$3.$4 $5.$6.$7.$8'
# fi
-#
+#
# if [ `expr $2 : ".*\\."` -gt 0 ]; then
# MASK="$2 br b8<r b16<r b24< R|R|R|"
# else
# MASK="$2b 31b ^d D
# 11111111111111111111111111111111 x>1> x<1<"
# fi
-#
+#
# set `echo "$1 br b8<r b16<r b24< R|R|R| D # Load address
# $MASK D ~r # Load mask
-#
+#
# & DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP
# | DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP
# " | sed -f binary.sed`
diff --git a/testsuite/distrib.sh b/testsuite/distrib.sh
index dbadbdc..21e4c08 100644
--- a/testsuite/distrib.sh
+++ b/testsuite/distrib.sh
@@ -1,7 +1,7 @@
#! /bin/sh
#
# This is stolen from C News
-#
+#
#
diff --git a/testsuite/eval.good b/testsuite/eval.good
index 6fd021b..4988e12 100644
--- a/testsuite/eval.good
+++ b/testsuite/eval.good
@@ -13,20 +13,20 @@ cpu
17380: 2 2 5 11 79
cpu
---
- abcd
+ abcd
---
- abcd
+ abcd
---
- abcd
+ abcd
---
17380: 2 2 5 11 79
- cpu
+ cpu
---
17380: 2 2 5 11 79
- cpu
+ cpu
---
17380: 2 2 5 11 79
- cpu
+ cpu
---
Doing some more tests -----------------------
17380: 2 2 5 11 79
diff --git a/testsuite/eval.inp b/testsuite/eval.inp
index 4e30989..6c3df08 100644
--- a/testsuite/eval.inp
+++ b/testsuite/eval.inp
@@ -1,5 +1,5 @@
17380: 2 2 5 11 79
abcd
cpu
- abcd
- cpu
+ abcd
+ cpu
diff --git a/testsuite/inclib.good b/testsuite/inclib.good
index 6b1279a..cb04b39 100644
--- a/testsuite/inclib.good
+++ b/testsuite/inclib.good
@@ -1,34 +1,34 @@
- /usr/X11R6/include
- /usr/X11R5/include
- /usr/X11R4/include
-
- /usr/include/X11R6
- /usr/include/X11R5
- /usr/include/X11R4
-
- /usr/local/X11R6/include
- /usr/local/X11R5/include
- /usr/local/X11R4/include
-
- /usr/local/include/X11R6
- /usr/local/include/X11R5
- /usr/local/include/X11R4
-
- /usr/X11/include
- /usr/include/X11
- /usr/local/X11/include
- /usr/local/include/X11
-
- /usr/X386/include
- /usr/x386/include
- /usr/XFree86/include/X11
-
- /usr/include
- /usr/local/include
- /usr/unsupported/include
- /usr/athena/include
- /usr/local/x11r5/include
- /usr/lpp/Xamples/include
-
- /usr/openwin/include
- /usr/openwin/share/include
+ /usr/X11R6/include
+ /usr/X11R5/include
+ /usr/X11R4/include
+
+ /usr/include/X11R6
+ /usr/include/X11R5
+ /usr/include/X11R4
+
+ /usr/local/X11R6/include
+ /usr/local/X11R5/include
+ /usr/local/X11R4/include
+
+ /usr/local/include/X11R6
+ /usr/local/include/X11R5
+ /usr/local/include/X11R4
+
+ /usr/X11/include
+ /usr/include/X11
+ /usr/local/X11/include
+ /usr/local/include/X11
+
+ /usr/X386/include
+ /usr/x386/include
+ /usr/XFree86/include/X11
+
+ /usr/include
+ /usr/local/include
+ /usr/unsupported/include
+ /usr/athena/include
+ /usr/local/x11r5/include
+ /usr/lpp/Xamples/include
+
+ /usr/openwin/include
+ /usr/openwin/share/include
diff --git a/testsuite/inclib.inp b/testsuite/inclib.inp
index 552e9e2..1f71277 100644
--- a/testsuite/inclib.inp
+++ b/testsuite/inclib.inp
@@ -1,34 +1,34 @@
- /usr/X11R6/lib
- /usr/X11R5/lib
- /usr/X11R4/lib
-
- /usr/lib/X11R6
- /usr/lib/X11R5
- /usr/lib/X11R4
-
- /usr/local/X11R6/lib
- /usr/local/X11R5/lib
- /usr/local/X11R4/lib
-
- /usr/local/lib/X11R6
- /usr/local/lib/X11R5
- /usr/local/lib/X11R4
-
- /usr/X11/lib
- /usr/lib/X11
- /usr/local/X11/lib
- /usr/local/lib/X11
-
- /usr/X386/lib
- /usr/x386/lib
- /usr/XFree86/lib/X11
-
- /usr/lib
- /usr/local/lib
- /usr/unsupported/lib
- /usr/athena/lib
- /usr/local/x11r5/lib
- /usr/lpp/Xamples/lib
-
- /usr/openwin/lib
- /usr/openwin/share/lib
+ /usr/X11R6/lib
+ /usr/X11R5/lib
+ /usr/X11R4/lib
+
+ /usr/lib/X11R6
+ /usr/lib/X11R5
+ /usr/lib/X11R4
+
+ /usr/local/X11R6/lib
+ /usr/local/X11R5/lib
+ /usr/local/X11R4/lib
+
+ /usr/local/lib/X11R6
+ /usr/local/lib/X11R5
+ /usr/local/lib/X11R4
+
+ /usr/X11/lib
+ /usr/lib/X11
+ /usr/local/X11/lib
+ /usr/local/lib/X11
+
+ /usr/X386/lib
+ /usr/x386/lib
+ /usr/XFree86/lib/X11
+
+ /usr/lib
+ /usr/local/lib
+ /usr/unsupported/lib
+ /usr/athena/lib
+ /usr/local/x11r5/lib
+ /usr/lpp/Xamples/lib
+
+ /usr/openwin/lib
+ /usr/openwin/share/lib
diff --git a/testsuite/khadafy.good b/testsuite/khadafy.good
index e719f4e..57e21a1 100644
--- a/testsuite/khadafy.good
+++ b/testsuite/khadafy.good
@@ -26,7 +26,7 @@
26) Muammar Quathafi
27) Muammar Gheddafi
28) Muamar Al-Kaddafi
-29) Moammar Khadafy
+29) Moammar Khadafy
30) Moammar Qudhafi
31) Mu'ammar al-Qaddafi
32) Mulazim Awwal Mu'ammar Muhammad Abu Minyar al-Qadhafi
diff --git a/testsuite/khadafy.inp b/testsuite/khadafy.inp
index e719f4e..57e21a1 100644
--- a/testsuite/khadafy.inp
+++ b/testsuite/khadafy.inp
@@ -26,7 +26,7 @@
26) Muammar Quathafi
27) Muammar Gheddafi
28) Muamar Al-Kaddafi
-29) Moammar Khadafy
+29) Moammar Khadafy
30) Moammar Qudhafi
31) Mu'ammar al-Qaddafi
32) Mulazim Awwal Mu'ammar Muhammad Abu Minyar al-Qadhafi
diff --git a/testsuite/linecnt.good b/testsuite/linecnt.good
index 3cc1bd6..0488b62 100644
--- a/testsuite/linecnt.good
+++ b/testsuite/linecnt.good
@@ -33,7 +33,7 @@ A dialogue on poverty
17
But cold and bitter is the night!
18
- As for those poorer than myself,
+ As for those poorer than myself,
19
Their parents must be cold and hungry,
20
@@ -41,7 +41,7 @@ A dialogue on poverty
21
Then, how do you struggle through life?
22
-
+
23
Wide as they call the heaven and earth,
24
diff --git a/testsuite/linecnt.inp b/testsuite/linecnt.inp
index 9eb6070..a34df29 100644
--- a/testsuite/linecnt.inp
+++ b/testsuite/linecnt.inp
@@ -15,11 +15,11 @@ A dialogue on poverty
I pull up my hempen bedclothes,
Wear what few sleeveless clothes I have,
But cold and bitter is the night!
- As for those poorer than myself,
+ As for those poorer than myself,
Their parents must be cold and hungry,
Their wives and children beg and cry.
Then, how do you struggle through life?
-
+
Wide as they call the heaven and earth,
For me they have shrunk quite small;
Bright though they call the sun and moon,
diff --git a/testsuite/mac-mf.good b/testsuite/mac-mf.good
index 9be165d..4e8bc45 100644
--- a/testsuite/mac-mf.good
+++ b/testsuite/mac-mf.good
@@ -6,72 +6,72 @@
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
# This first part is long enough that NFS:Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make
#
@@ -80,18 +80,18 @@
WHAT = mac
-# Directory syntax Ä
+# Directory syntax Ä
R=
C=
S=:
U=:
BUILDTOP = :::
-srcdir =
+srcdir =
# FIXME Ä This doesn't translate to MPW yet, srcdir must be same as objdir
# File in object dir can come from either the current dir or srcdir
-#
+#
# . Ä . "{srcdir}"
# Default rule that puts each file into separate segment
@@ -106,8 +106,8 @@ LD = link
# The funny quoting in the LDFLAGS is to avoid xxx.c.o being mangled by
# mac-mf.sed into xxx.c.o
LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"ToolLibs."o {Libraries}"Interface."o
-CCOPTS =
-LIBS =
+CCOPTS =
+LIBS =
KRB5ROOT= @KRB5ROOT@
KRB4=@KRB4@
INSTALL=Duplicate -y
@@ -157,7 +157,7 @@ OBJEXT = c.o
LIBEXT = a
EXEEXT =
-all ÄÄ
+all ÄÄ
# Generated automatically from Makefile.in by configure
CFLAGS = {CCOPTS} {DEFS} -i ::des
@@ -169,32 +169,32 @@ OBJS= md5.{OBJEXT} md5glue.{OBJEXT} md5crypto.{OBJEXT}
SRCS= md5.c md5glue.c md5crypto.c
-all ÄÄ {OBJS}
+all ÄÄ {OBJS}
t_mddriver Ä t_mddriver.c.o md5.c.o
Link {LDFLAGS} -o t_mddriver t_mddriver.c.o md5.c.o
-t_mddriver.exe Ä
+t_mddriver.exe Ä
{CC} {CFLAGS2} -o t_mddriver.exe t_mddriver.c md5.c
check ÄÄ t_mddriver{EXEEXT}
{C}t_mddriver{EXEEXT} -x
-clean ÄÄ
+clean ÄÄ
{RM} t_mddriver{EXEEXT} t_mddriver.{OBJEXT}
# config:post.in
# put all ÄÄ first just in case no other rules occur here
#
-all ÄÄ
+all ÄÄ
-check ÄÄ
+check ÄÄ
clean ÄÄ clean-{WHAT}
{RM} config.log pre.c.out post.c.out Makefile.c.out
-clean-unix ÄÄ
+clean-unix ÄÄ
if test -n "{OBJS}" ; then {RM} {OBJS}; else Ä ; fi
-clean-windows ÄÄ
+clean-windows ÄÄ
{RM} Å.{OBJEXT}
{RM} msvc.pdb Å.err
diff --git a/testsuite/mac-mf.inp b/testsuite/mac-mf.inp
index 3adaee2..7d80191 100644
--- a/testsuite/mac-mf.inp
+++ b/testsuite/mac-mf.inp
@@ -6,72 +6,72 @@
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
# This first part is long enough that NFS/Share doesn't notice the non-ASCII
# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
+# TEXT, which is what we want. The non-ASCII chars are necessary for MPW
# Make.
#
@@ -91,7 +91,7 @@ srcdir = .
# FIXME: This doesn't translate to MPW yet, srcdir must be same as objdir.
# File in object dir can come from either the current dir or srcdir.
-#
+#
# . : . "{srcdir}"
# Default rule that puts each file into separate segment.
@@ -106,8 +106,8 @@ LD = link
# The funny quoting in the LDFLAGS is to avoid xxx.o being mangled by
# mac-mf.sed into xxx.c.o.
LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"ToolLibs."o {Libraries}"Interface."o
-CCOPTS =
-LIBS =
+CCOPTS =
+LIBS =
KRB5ROOT= @KRB5ROOT@
KRB4=@KRB4@
INSTALL=Duplicate -y
@@ -169,7 +169,7 @@ OBJS= md5.$(OBJEXT) md5glue.$(OBJEXT) md5crypto.$(OBJEXT)
SRCS= $(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
-all:: $(OBJS)
+all:: $(OBJS)
t_mddriver: t_mddriver.o md5.o
$(CC) $(CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o
diff --git a/testsuite/mac-mf.sed b/testsuite/mac-mf.sed
index 9b08e60..680ce89 100644
--- a/testsuite/mac-mf.sed
+++ b/testsuite/mac-mf.sed
@@ -26,7 +26,7 @@
# Rules for .. and . elsewhere in the line
# Convert ../: to ::, recur to get whole paths.
/\./s,\.\./:,::,g
-# Convert ../../ to :::
+# Convert ../../ to :::
/\./s,\.\./\.\./,:::,g
/\./s,\.\./,::,g
/\.\//s,\./,:,g
@@ -152,3 +152,4 @@
/Option/s/\\Option-f/Ä/g
/Option/s/\\Option-d/¶/g
/Option/s/\\Option-x/Å/g
+s/ $//
diff --git a/testsuite/manis.sed b/testsuite/manis.sed
index 5017845..51c9a50 100644
--- a/testsuite/manis.sed
+++ b/testsuite/manis.sed
@@ -1,6 +1,6 @@
# straight out of an autoconf-generated configure.
# The input should look just like the input after this is run.
#
-# Protect against being on the right side of a sed subst in config.status.
-s/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
+# Protect against being on the right side of a sed subst in config.status.
+s/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
s/@@/%@/; s/@@/@%/; s/@g$/%g/
diff --git a/testsuite/tst-pcre.c b/testsuite/tst-pcre.c
index e8c6a0b..dcff1a4 100644
--- a/testsuite/tst-pcre.c
+++ b/testsuite/tst-pcre.c
@@ -141,7 +141,7 @@ main (int argc, char **argv)
{
regex_t re;
int n;
-
+
if (!pattern_valid)
{
printf ("%lu: No previous valid pattern %s\n", linenum, line);
diff --git a/testsuite/uniq.good b/testsuite/uniq.good
index 2941bec..95fc5ee 100644
--- a/testsuite/uniq.good
+++ b/testsuite/uniq.good
@@ -515,7 +515,7 @@ if (min > 0)
if (min > md->end_subject - eptr)
if (minimize)
if (number > 0)
-if (number > EXTRACT_BASIC_MAX)
+if (number > EXTRACT_BASIC_MAX)
if (offset < md->offset_max)
if (offset >= md->offset_max)
if (offset_top <= offset)
diff --git a/testsuite/uniq.inp b/testsuite/uniq.inp
index b1eddf3..aa61062 100644
--- a/testsuite/uniq.inp
+++ b/testsuite/uniq.inp
@@ -1240,8 +1240,8 @@ if (minimize)
if (minimize)
if (minimize)
if (number > 0)
-if (number > EXTRACT_BASIC_MAX)
-if (number > EXTRACT_BASIC_MAX)
+if (number > EXTRACT_BASIC_MAX)
+if (number > EXTRACT_BASIC_MAX)
if (offset < md->offset_max)
if (offset >= md->offset_max)
if (offset_top <= offset)
diff --git a/testsuite/y-bracket.good b/testsuite/y-bracket.good
index 278fee9..7e1a0ac 100644
--- a/testsuite/y-bracket.good
+++ b/testsuite/y-bracket.good
@@ -1 +1 @@
-Are you sure (y/n)? y]
+Are you sure (y/n)? y]
diff --git a/testsuite/y-bracket.inp b/testsuite/y-bracket.inp
index fe6124f..131c38c 100644
--- a/testsuite/y-bracket.inp
+++ b/testsuite/y-bracket.inp
@@ -1 +1 @@
-Are you sure (y/n)? [y]
+Are you sure (y/n)? [y]
diff --git a/testsuite/y-newline.good b/testsuite/y-newline.good
index b0f2bfe..371b9cb 100644
--- a/testsuite/y-newline.good
+++ b/testsuite/y-newline.good
@@ -1 +1 @@
-Are Sou Yure (S/n)? [S] $$Are Sou Yure (S/n)? [S]
+Are Sou Yure (S/n)? [S]$$Are Sou Yure (S/n)? [S]
diff --git a/testsuite/y-newline.inp b/testsuite/y-newline.inp
index fe6124f..131c38c 100644
--- a/testsuite/y-newline.inp
+++ b/testsuite/y-newline.inp
@@ -1 +1 @@
-Are you sure (y/n)? [y]
+Are you sure (y/n)? [y]