diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-01-27 12:12:12 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-01-27 12:12:12 +0200 |
| commit | 46a2c1e4abbbb79df33bd9a4b79ea878ea297e48 (patch) | |
| tree | c83eb140f531d71655b651ebec7af82659543955 /test | |
| parent | a405df4fd26c1a1428fb3eb9d749c42295256634 (diff) | |
| parent | c0c69f02e4d300aebf91516a1a521828f6885b26 (diff) | |
| download | egawk-46a2c1e4abbbb79df33bd9a4b79ea878ea297e48.tar.gz egawk-46a2c1e4abbbb79df33bd9a4b79ea878ea297e48.tar.bz2 egawk-46a2c1e4abbbb79df33bd9a4b79ea878ea297e48.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/Makefile.in | 10 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/gensub3.awk | 8 | ||||
| -rw-r--r-- | test/gensub3.in | 2 | ||||
| -rw-r--r-- | test/gensub3.ok | 1 |
7 files changed, 34 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 1b2d4022..3566cce7 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2017-01-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (gensub3): New test. + * gensub3.awk, gensub3.in, gensub3.ok: New files. + 2017-01-15 Andrew J. Schorr <aschorr@telemetry-investments.com> * Makefile.am (concat5): New test. diff --git a/test/Makefile.am b/test/Makefile.am index cc9f6d12..9f79df8f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -395,6 +395,9 @@ EXTRA_DIST = \ gensub.ok \ gensub2.awk \ gensub2.ok \ + gensub3.awk \ + gensub3.in \ + gensub3.ok \ getfile.awk \ getfile.ok \ getline.awk \ @@ -1213,7 +1216,7 @@ GAWK_EXT_TESTS = \ devfd devfd1 devfd2 dumpvars errno exit \ fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ - genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops gsubind \ + genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ include include2 indirectbuiltin indirectcall indirectcall2 intarray \ diff --git a/test/Makefile.in b/test/Makefile.in index a45e26ef..1cd8bf15 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -653,6 +653,9 @@ EXTRA_DIST = \ gensub.ok \ gensub2.awk \ gensub2.ok \ + gensub3.awk \ + gensub3.in \ + gensub3.ok \ getfile.awk \ getfile.ok \ getline.awk \ @@ -1470,7 +1473,7 @@ GAWK_EXT_TESTS = \ devfd devfd1 devfd2 dumpvars errno exit \ fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ - genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops gsubind \ + genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ include include2 indirectbuiltin indirectcall indirectcall2 intarray \ @@ -3993,6 +3996,11 @@ gensub2: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +gensub3: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + getlndir: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 5b91af61..30211d66 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1192,6 +1192,11 @@ gensub2: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +gensub3: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + getlndir: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/gensub3.awk b/test/gensub3.awk new file mode 100644 index 00000000..be0f7538 --- /dev/null +++ b/test/gensub3.awk @@ -0,0 +1,8 @@ +/apple/ { + $0 = $0 + x = $0 +} + +END { + print x +} diff --git a/test/gensub3.in b/test/gensub3.in new file mode 100644 index 00000000..f38fe2fa --- /dev/null +++ b/test/gensub3.in @@ -0,0 +1,2 @@ +apple +pear diff --git a/test/gensub3.ok b/test/gensub3.ok new file mode 100644 index 00000000..4c479def --- /dev/null +++ b/test/gensub3.ok @@ -0,0 +1 @@ +apple |