diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-11-01 21:36:13 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-11-01 21:36:13 +0200 |
| commit | f7904deae23ca465c4035fc913b7dbe1abca19a9 (patch) | |
| tree | ff281cfeb227781d26a2ded3f168eeca458e3cb4 | |
| parent | e8f34d6db9d1c4343ecfacd94cd5d0441ffacee4 (diff) | |
| parent | 2f19ce406c3c350dcf6de6454d5c7e1bd7755c24 (diff) | |
| download | egawk-f7904deae23ca465c4035fc913b7dbe1abca19a9.tar.gz egawk-f7904deae23ca465c4035fc913b7dbe1abca19a9.tar.bz2 egawk-f7904deae23ca465c4035fc913b7dbe1abca19a9.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/profile6.ok | 10 |
4 files changed, 13 insertions, 7 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 614dc1d0..b50b5612 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2014-11-01 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (profile6): Actually run profiling. Should make test + output consistent with what's in master. + * profile6.ok: Updated. + 2014-10-30 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (profile6): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 5f2b4c67..447a89db 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1704,7 +1704,7 @@ profile5: profile6: @echo $@ - @GAWK_NO_PP_RUN=1 $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null + $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null @sed 1,2d < ap-$@.out > _$@; rm ap-$@.out @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/test/Makefile.in b/test/Makefile.in index c7a14fcf..71f0dd60 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2128,7 +2128,7 @@ profile5: profile6: @echo $@ - @GAWK_NO_PP_RUN=1 $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null + $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null @sed 1,2d < ap-$@.out > _$@; rm ap-$@.out @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/test/profile6.ok b/test/profile6.ok index 86ff68a6..0c9486c7 100644 --- a/test/profile6.ok +++ b/test/profile6.ok @@ -1,10 +1,10 @@ # BEGIN rule(s) BEGIN { - x = 3 - print -(-x) - Q = "|" - print -3 Q (-4) - print -3 Q (-4) (-5) + 1 x = 3 + 1 print -(-x) + 1 Q = "|" + 1 print -3 Q (-4) + 1 print -3 Q (-4) (-5) } |