From 14df926d1e796b1227b34384c388b1580f05e840 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Tue, 5 May 2015 12:02:36 +0300 Subject: Fix parsing brackets in regexps (again). --- test/ChangeLog | 5 +++++ test/Makefile.am | 6 +++++- test/Makefile.in | 11 ++++++++++- test/Maketests | 5 +++++ test/rebrackloc.awk | 31 +++++++++++++++++++++++++++++++ test/rebrackloc.in | 3 +++ test/rebrackloc.ok | 17 +++++++++++++++++ 7 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 test/rebrackloc.awk create mode 100644 test/rebrackloc.in create mode 100644 test/rebrackloc.ok (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index b191e866..92a341d8 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-05-05 Andrew J. Schorr + + * Makefile.am (rebrackloc): New test. + * rebrackloc.awk, rebrackloc.in, rebrackloc.ok: New files. + 2015-04-29 Arnold D. Robbins * 4.1.2: Release tar ball made. diff --git a/test/Makefile.am b/test/Makefile.am index edad8bb6..db3cc860 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -755,6 +755,9 @@ EXTRA_DIST = \ readdir0.awk \ readfile2.awk \ readfile2.ok \ + rebrackloc.awk \ + rebrackloc.in \ + rebrackloc.ok \ rebt8b1.awk \ rebt8b1.ok \ rebt8b2.awk \ @@ -1032,7 +1035,8 @@ BASIC_TESTS = \ paramdup paramres paramtyp paramuninitglobal parse1 parsefld parseme \ pcntplus posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \ prt1eval prtoeval \ - rand range1 rebt8b1 redfilnm regeq regexpbrack regexpbrack2 regexprange regrange reindops \ + rand range1 rebrackloc rebt8b1 redfilnm regeq regexpbrack regexpbrack2 \ + regexprange regrange reindops \ reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ rstest3 rstest4 rstest5 rswhite \ scalar sclforin sclifin sortempty sortglos splitargv splitarr splitdef \ diff --git a/test/Makefile.in b/test/Makefile.in index b5492261..ed095afc 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1012,6 +1012,9 @@ EXTRA_DIST = \ readdir0.awk \ readfile2.awk \ readfile2.ok \ + rebrackloc.awk \ + rebrackloc.in \ + rebrackloc.ok \ rebt8b1.awk \ rebt8b1.ok \ rebt8b2.awk \ @@ -1288,7 +1291,8 @@ BASIC_TESTS = \ paramdup paramres paramtyp paramuninitglobal parse1 parsefld parseme \ pcntplus posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \ prt1eval prtoeval \ - rand range1 rebt8b1 redfilnm regeq regexpbrack regexpbrack2 regexprange regrange reindops \ + rand range1 rebrackloc rebt8b1 redfilnm regeq regexpbrack regexpbrack2 \ + regexprange regrange reindops \ reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ rstest3 rstest4 rstest5 rswhite \ scalar sclforin sclifin sortempty sortglos splitargv splitarr splitdef \ @@ -3208,6 +3212,11 @@ range1: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +rebrackloc: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + rebt8b1: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 95d9e80a..651ff03b 100644 --- a/test/Maketests +++ b/test/Maketests @@ -702,6 +702,11 @@ range1: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +rebrackloc: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + rebt8b1: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/rebrackloc.awk b/test/rebrackloc.awk new file mode 100644 index 00000000..c5987fcb --- /dev/null +++ b/test/rebrackloc.awk @@ -0,0 +1,31 @@ +match($0, /([Nn]ew) Value +[\([]? *([[:upper:]]+)/, f) { + print "re1", NR, f[1], f[2] +} + +match($0, /([][])/, f) { + print "re2", NR, f[1] +} + +/[]]/ { + print "re3", NR, $0 +} + +/[\[]/ { + print "re4", NR, $0 +} + +/[[]/ { + print "re5", NR, $0 +} + +/[][]/ { + print "re6", NR, $0 +} + +/[\([][[:upper:]]*/ { + print "re7", NR, $0 +} + +/[\([]/ { + print "re8", NR, $0 +} diff --git a/test/rebrackloc.in b/test/rebrackloc.in new file mode 100644 index 00000000..d82369b6 --- /dev/null +++ b/test/rebrackloc.in @@ -0,0 +1,3 @@ +New Value [XYZ] +[ +] diff --git a/test/rebrackloc.ok b/test/rebrackloc.ok new file mode 100644 index 00000000..ec98bf58 --- /dev/null +++ b/test/rebrackloc.ok @@ -0,0 +1,17 @@ +re1 1 New XYZ +re2 1 [ +re3 1 New Value [XYZ] +re4 1 New Value [XYZ] +re5 1 New Value [XYZ] +re6 1 New Value [XYZ] +re7 1 New Value [XYZ] +re8 1 New Value [XYZ] +re2 2 [ +re4 2 [ +re5 2 [ +re6 2 [ +re7 2 [ +re8 2 [ +re2 3 ] +re3 3 ] +re6 3 ] -- cgit v1.2.3 From 8678161d1886392b3ef1e5621e550ef5a2dc6d3a Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Tue, 5 May 2015 12:12:52 +0300 Subject: Wrap dbueval test in check for tty. --- test/ChangeLog | 6 ++++++ test/Makefile.am | 6 ++++-- test/Makefile.in | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index 92a341d8..f70256b4 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-05-05 Arnold D. Robbins + + * Makefile.am (dbugeval): Wrap in test for interactive terminal + to avoid Mac OS X failure. Thanks to Nelson H.F. Beebe for + the report. + 2015-05-05 Andrew J. Schorr * Makefile.am (rebrackloc): New test. diff --git a/test/Makefile.am b/test/Makefile.am index db3cc860..8838b700 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2038,8 +2038,10 @@ backsmalls2: dbugeval:: @echo $@ - @$(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @if [ -t 0 ]; then \ + $(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi printhuge:: @echo $@ diff --git a/test/Makefile.in b/test/Makefile.in index ed095afc..4c0fd9e1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2475,8 +2475,10 @@ backsmalls2: dbugeval:: @echo $@ - @$(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @if [ -t 0 ]; then \ + $(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi printhuge:: @echo $@ -- cgit v1.2.3