aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2020-04-10 14:39:28 +0300
committerArnold D. Robbins <arnold@skeeve.com>2020-04-10 14:39:28 +0300
commitdf52ba3de4c18482e2d6f81b94f3e9cd6c83aa7a (patch)
tree30da4e206c019fd64814d5efa9f93351c5728950 /test
parent6e69b1c42ef002c41a5807f5886f78767881bfca (diff)
downloadegawk-df52ba3de4c18482e2d6f81b94f3e9cd6c83aa7a.tar.gz
egawk-df52ba3de4c18482e2d6f81b94f3e9cd6c83aa7a.tar.bz2
egawk-df52ba3de4c18482e2d6f81b94f3e9cd6c83aa7a.zip
Bug fix for FPAT field parsing.
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/Makefile.am7
-rw-r--r--test/Makefile.in12
-rw-r--r--test/Maketests5
-rw-r--r--test/fpat8.awk10
-rw-r--r--test/fpat8.in1
-rw-r--r--test/fpat8.ok2
7 files changed, 38 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index de6e4427..cd7ba9a7 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXTRA_DIST): New test, fpat8.
+ * fpat8.awk, fpat8.in, fpat8.ok: New files.
+
2020-04-02 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXTRA_DIST): New test, rsnulw.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1465c70d..c2ad113c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -369,6 +369,9 @@ EXTRA_DIST = \
fpat7.awk \
fpat7.in \
fpat7.ok \
+ fpat8.awk \
+ fpat8.in \
+ fpat8.ok \
fpatnull.awk \
fpatnull.in \
fpatnull.ok \
@@ -1385,8 +1388,8 @@ GAWK_EXT_TESTS = \
clos1way6 crlf \
dbugeval dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub \
devfd devfd1 devfd2 dfacheck1 dumpvars \
- errno exit \
- fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpatnull \
+ errno exit fieldwdth forcenum \
+ fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpatnull \
fsfwfs funlen functab1 functab2 functab3 \
fwtest fwtest2 fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 \
genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
diff --git a/test/Makefile.in b/test/Makefile.in
index c7a39cb2..67051084 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -630,6 +630,9 @@ EXTRA_DIST = \
fpat7.awk \
fpat7.in \
fpat7.ok \
+ fpat8.awk \
+ fpat8.in \
+ fpat8.ok \
fpatnull.awk \
fpatnull.in \
fpatnull.ok \
@@ -1646,8 +1649,8 @@ GAWK_EXT_TESTS = \
clos1way6 crlf \
dbugeval dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub \
devfd devfd1 devfd2 dfacheck1 dumpvars \
- errno exit \
- fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpatnull \
+ errno exit fieldwdth forcenum \
+ fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpatnull \
fsfwfs funlen functab1 functab2 functab3 \
fwtest fwtest2 fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 \
genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
@@ -4289,6 +4292,11 @@ fpat7:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+fpat8:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
fpatnull:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 01934096..6982870d 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1426,6 +1426,11 @@ fpat7:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+fpat8:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
fpatnull:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/fpat8.awk b/test/fpat8.awk
new file mode 100644
index 00000000..9c41591b
--- /dev/null
+++ b/test/fpat8.awk
@@ -0,0 +1,10 @@
+BEGIN {
+ RS = ""
+ FPAT = "\\w+"
+}
+
+{
+ print
+ $2 = "-"
+ print
+}
diff --git a/test/fpat8.in b/test/fpat8.in
new file mode 100644
index 00000000..8e13e468
--- /dev/null
+++ b/test/fpat8.in
@@ -0,0 +1 @@
+a b c d
diff --git a/test/fpat8.ok b/test/fpat8.ok
new file mode 100644
index 00000000..0e13f5b4
--- /dev/null
+++ b/test/fpat8.ok
@@ -0,0 +1,2 @@
+a b c d
+a - c d