diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-01 20:54:20 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-01 20:54:20 +0200 |
| commit | 545cc9691e3d6479053684815d23e6553a7d0a95 (patch) | |
| tree | ed2d4bb149410bcb382aa05545a5e3d56289c927 /test | |
| parent | 86cd3e2cb5117c5800997d3bb363b6d5470be3ce (diff) | |
| parent | bcb51623b8e156b03c2ae588906e4ed25fa3eba2 (diff) | |
| download | egawk-545cc9691e3d6479053684815d23e6553a7d0a95.tar.gz egawk-545cc9691e3d6479053684815d23e6553a7d0a95.tar.bz2 egawk-545cc9691e3d6479053684815d23e6553a7d0a95.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 9 | ||||
| -rw-r--r-- | test/Makefile.in | 20 | ||||
| -rw-r--r-- | test/Maketests | 10 | ||||
| -rw-r--r-- | test/indirectcall.awk | 8 |
5 files changed, 29 insertions, 25 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index ac031426..e9d5620a 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,6 +1,11 @@ +2015-02-01 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (paramasfunc1, paramasfunc2): Now need --posix. + * indirectcall.awk: Restore after code change. + 2015-01-30 Arnold D. Robbins <arnold@skeeve.com> - * Makefile.in (callparam, paramasfunc1, paramasfunc2): New tests. + * Makefile.am (callparam, paramasfunc1, paramasfunc2): New tests. * callparam.awk, callparam.ok: New files. * paramasfunc1.awk, paramasfunc1.ok: New files. * paramasfunc2.awk, paramasfunc2.ok: New files. diff --git a/test/Makefile.am b/test/Makefile.am index a3fe1beb..c4c0b8b3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2026,6 +2026,15 @@ genpot: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --gen-pot >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +paramasfunc1:: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +paramasfunc2:: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 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 57d28cac..212cb779 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2461,6 +2461,16 @@ genpot: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --gen-pot >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +paramasfunc1:: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +paramasfunc2:: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -3068,16 +3078,6 @@ opasnslf: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -paramasfunc1: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - -paramasfunc2: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - paramdup: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 41c85c01..f3639b0f 100644 --- a/test/Maketests +++ b/test/Maketests @@ -605,16 +605,6 @@ opasnslf: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -paramasfunc1: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - -paramasfunc2: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - paramdup: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/indirectcall.awk b/test/indirectcall.awk index 74290973..5cfdd235 100644 --- a/test/indirectcall.awk +++ b/test/indirectcall.awk @@ -5,13 +5,13 @@ # average --- return the average of the values in fields $first - $last -function average(first, last, the_sum, i) +function average(first, last, sum, i) { - the_sum = 0; + sum = 0; for (i = first; i <= last; i++) - the_sum += $i + sum += $i - return the_sum / (last - first + 1) + return sum / (last - first + 1) } # sum --- return the average of the values in fields $first - $last |