diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-03-21 13:22:18 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-03-21 13:22:18 -0400 |
| commit | d1bebd3cbf60fa25883271512cf63e0c3275e3ef (patch) | |
| tree | 517a5e996e033120e73afbb4c265528909271fbc /test | |
| parent | 489349d84fa92f69b2066240bc202a4f2777c465 (diff) | |
| download | egawk-d1bebd3cbf60fa25883271512cf63e0c3275e3ef.tar.gz egawk-d1bebd3cbf60fa25883271512cf63e0c3275e3ef.tar.bz2 egawk-d1bebd3cbf60fa25883271512cf63e0c3275e3ef.zip | |
Enhance FIELDWIDTHS syntax to support a skip prefix, and unify logic with API field parsing.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 9 | ||||
| -rw-r--r-- | test/Makefile.in | 11 | ||||
| -rw-r--r-- | test/fwtest2b.awk | 6 | ||||
| -rw-r--r-- | test/fwtest2b.ok | 12 |
5 files changed, 40 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index ad1b35b1..46c52626 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2017-03-21 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (fwtest2b): Add new test of enhanced FIELDWIDTHS syntax. + * fwtest2b.awk, fwtest2b.ok: New files. + 2017-03-19 Andrew J. Schorr <aschorr@telemetry-investments.com> * Makefile.am (argarray): Always copy argarray.in to the local diff --git a/test/Makefile.am b/test/Makefile.am index 855958f1..b46f36e3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -385,6 +385,8 @@ EXTRA_DIST = \ fwtest2.awk \ fwtest2.in \ fwtest2.ok \ + fwtest2b.awk \ + fwtest2b.ok \ fwtest3.awk \ fwtest3.in \ fwtest3.ok \ @@ -1221,7 +1223,7 @@ GAWK_EXT_TESTS = \ crlf dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \ devfd devfd1 devfd2 dumpvars errno exit \ fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ - functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ + functab1 functab2 functab3 fwtest fwtest2 fwtest2b fwtest3 \ genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ @@ -2373,6 +2375,11 @@ arrdbg: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok # @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok || exit 0 +fwtest2b: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/fwtest2.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index c23156df..fe449734 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -643,6 +643,8 @@ EXTRA_DIST = \ fwtest2.awk \ fwtest2.in \ fwtest2.ok \ + fwtest2b.awk \ + fwtest2b.ok \ fwtest3.awk \ fwtest3.in \ fwtest3.ok \ @@ -1478,7 +1480,7 @@ GAWK_EXT_TESTS = \ crlf dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \ devfd devfd1 devfd2 dumpvars errno exit \ fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ - functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ + functab1 functab2 functab3 fwtest fwtest2 fwtest2b fwtest3 \ genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ @@ -2809,6 +2811,12 @@ arrdbg: @echo $@ @$(AWK) -v "okfile=$(srcdir)/$@.ok" -f "$(srcdir)"/$@.awk | grep array_f >_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok +# @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok || exit 0 + +fwtest2b: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/fwtest2.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -4463,7 +4471,6 @@ time: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ # end of file Maketests -# @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ "$(srcdir)"/$@.ok || exit 0 # Targets generated for other tests: diff --git a/test/fwtest2b.awk b/test/fwtest2b.awk new file mode 100644 index 00000000..5e96c1aa --- /dev/null +++ b/test/fwtest2b.awk @@ -0,0 +1,6 @@ +BEGIN { + FIELDWIDTHS = "2:13 2:13 2:13"; +} +{ + printf "%s|%s|%s\n", $1, $2, $3 +} diff --git a/test/fwtest2b.ok b/test/fwtest2b.ok new file mode 100644 index 00000000..f4d28232 --- /dev/null +++ b/test/fwtest2b.ok @@ -0,0 +1,12 @@ + 0.4867373206| 1.3206333033|-0.2333178127 + 0.5668176165| 1.3711756314|-0.2193558040 + 0.4325251781| 1.3399488722|-0.1568307497 + 0.4900487563| 1.3295759570|-0.2217392402 +-0.6790064191| 1.2536623801|-0.2955415433 +-0.6311440220| 1.2966579993|-0.2246692210 +-0.7209390351| 1.1783407099|-0.2539408209 +-0.6782473356| 1.2495242556|-0.2811436366 +-0.7062054082| 1.1223820964|-1.1619805834 +-0.6491590119| 1.1248946162|-1.0851579675 +-0.7948856821| 1.1208852325|-1.1259821556 +-0.7102549262| 1.1225121126|-1.1475381286 |