diff options
| -rw-r--r-- | test/ChangeLog | 8 | ||||
| -rw-r--r-- | test/Makefile.am | 14 | ||||
| -rw-r--r-- | test/Makefile.in | 19 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/symtab7.awk | 7 | ||||
| -rw-r--r-- | test/symtab7.in | 3 | ||||
| -rw-r--r-- | test/symtab7.ok | 2 | ||||
| -rw-r--r-- | test/symtab8.awk | 5 | ||||
| -rw-r--r-- | test/symtab8.in | 1 | ||||
| -rw-r--r-- | test/symtab8.ok | 28 |
10 files changed, 90 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 2b669517..af93a7e8 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,11 @@ +2012-12-16 Arnold D. Robbins <arnold@skeeve.com> + + * symtab7.awk, symtab7.in, symtab7.ok, symtab8.awk, symtab8.in, + symtab8.ok: New files. + * Makefile.am (EXTRA_DIST): Add new files. + (symtab7, symtab8): New tests. + Thanks to Assaf Gordon <gordon@cshl.edu>. + 2012-11-19 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (readdir): Add a 'this could fail message'. diff --git a/test/Makefile.am b/test/Makefile.am index fc1a1076..793df595 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -807,6 +807,12 @@ EXTRA_DIST = \ symtab5.ok \ symtab6.awk \ symtab6.ok \ + symtab7.awk \ + symtab7.in \ + symtab7.ok \ + symtab8.awk \ + symtab8.in \ + symtab8.ok \ synerr1.awk \ synerr1.ok \ synerr2.awk \ @@ -929,7 +935,7 @@ GAWK_EXT_TESTS = \ rebuf regx8bit reint reint2 rsstart1 \ rsstart2 rsstart3 rstest6 shadow sortfor sortu splitarg4 strftime \ strtonum switch2 \ - symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 + symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 symtab7 symtab8 EXTRA_TESTS = inftest regtest @@ -1704,6 +1710,12 @@ symtab6: @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +symtab8: + @echo $@ + @$(AWK) -d__$@ -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ + @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' >> _$@ ; rm __$@ + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index b46f01fd..b97d4380 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1019,6 +1019,12 @@ EXTRA_DIST = \ symtab5.ok \ symtab6.awk \ symtab6.ok \ + symtab7.awk \ + symtab7.in \ + symtab7.ok \ + symtab8.awk \ + symtab8.in \ + symtab8.ok \ synerr1.awk \ synerr1.ok \ synerr2.awk \ @@ -1140,7 +1146,7 @@ GAWK_EXT_TESTS = \ rebuf regx8bit reint reint2 rsstart1 \ rsstart2 rsstart3 rstest6 shadow sortfor sortu splitarg4 strftime \ strtonum switch2 \ - symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 + symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 symtab7 symtab8 EXTRA_TESTS = inftest regtest INET_TESTS = inetdayu inetdayt inetechu inetecht @@ -2084,6 +2090,12 @@ symtab6: @$(AWK) -d__$@ -f $(srcdir)/$@.awk @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + +symtab8: + @echo $@ + @$(AWK) -d__$@ -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ + @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' >> _$@ ; rm __$@ + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -3291,6 +3303,11 @@ symtab5: @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +symtab7: + @echo $@ + @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + double1: @echo $@ @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 6e9a1a77..e7ab3c77 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1205,6 +1205,11 @@ symtab5: @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +symtab7: + @echo $@ + @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + double1: @echo $@ @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/symtab7.awk b/test/symtab7.awk new file mode 100644 index 00000000..eb051145 --- /dev/null +++ b/test/symtab7.awk @@ -0,0 +1,7 @@ +BEGIN { + getline + for (i = 1; i <= NF;++i) + SYMTAB[$i] = i +} + +{ print $Age } diff --git a/test/symtab7.in b/test/symtab7.in new file mode 100644 index 00000000..d2b5645d --- /dev/null +++ b/test/symtab7.in @@ -0,0 +1,3 @@ +Name Age +John 30 +Jane 40 diff --git a/test/symtab7.ok b/test/symtab7.ok new file mode 100644 index 00000000..28328831 --- /dev/null +++ b/test/symtab7.ok @@ -0,0 +1,2 @@ +30 +40 diff --git a/test/symtab8.awk b/test/symtab8.awk new file mode 100644 index 00000000..2c808318 --- /dev/null +++ b/test/symtab8.awk @@ -0,0 +1,5 @@ +{ + SYMTAB[$1] = 1 +} + +END { print $test } diff --git a/test/symtab8.in b/test/symtab8.in new file mode 100644 index 00000000..9daeafb9 --- /dev/null +++ b/test/symtab8.in @@ -0,0 +1 @@ +test diff --git a/test/symtab8.ok b/test/symtab8.ok new file mode 100644 index 00000000..8560c75a --- /dev/null +++ b/test/symtab8.ok @@ -0,0 +1,28 @@ +test +ARGC: 2 +ARGIND: 1 +ARGV: array, 2 elements +BINMODE: 0 +CONVFMT: "%.6g" +ERRNO: "" +FIELDWIDTHS: "" +FILENAME: "./symtab8.in" +FNR: 1 +FPAT: "[^[:space:]]+" +FS: " " +IGNORECASE: 0 +LINT: 0 +NF: 1 +NR: 1 +OFMT: "%.6g" +OFS: " " +ORS: "\n" +PREC: 53 +RLENGTH: 0 +ROUNDMODE: "N" +RS: "\n" +RSTART: 0 +RT: "\n" +SUBSEP: "\034" +TEXTDOMAIN: "messages" +test: 1 |