diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-08-21 21:48:32 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-08-21 21:48:32 +0300 |
| commit | fc3b12cc26f19d02e3e0d739e64258ad55f63a17 (patch) | |
| tree | 62403e57171c4a414c0fd25bbe53d10c57f7735a | |
| parent | dca882c1f4c12c048a01bc227993594b3ada299c (diff) | |
| parent | acd6f9a894f87ad9d662cbf7b24e7e87efc45154 (diff) | |
| download | egawk-fc3b12cc26f19d02e3e0d739e64258ad55f63a17.tar.gz egawk-fc3b12cc26f19d02e3e0d739e64258ad55f63a17.tar.bz2 egawk-fc3b12cc26f19d02e3e0d739e64258ad55f63a17.zip | |
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gawk
| -rw-r--r-- | pc/ChangeLog | 4 | ||||
| -rw-r--r-- | pc/Makefile.tst | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 83a20a8b..2e3a268d 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2017-08-21 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (testext): Remove textexttmp.txt. + 2017-08-19 Eli Zaretskii <eliz@gnu.org> * Makefile.tst (SLASH): New variable for use it readdir_test. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index a5534002..8a74e31c 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -1166,7 +1166,7 @@ testext:: # @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk textexttmp.txt getfile: @echo $@ diff --git a/test/ChangeLog b/test/ChangeLog index 8477084e..a015ebfe 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2017-08-21 Eli Zaretskii <eliz@gnu.org> + + * Makefile.am (testext): Remove textexttmp.txt. + 2017-08-16 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (EXTRA_DIST): Add aryunasgn files. diff --git a/test/Makefile.am b/test/Makefile.am index a4da78c1..b2577841 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1981,7 +1981,6 @@ profile1: @$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ cp "$(srcdir)"/dtdgport.awk $@.ok ; } - profile2: @echo $@ @@ -2210,7 +2209,7 @@ testext:: @echo $@ @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk textexttmp.txt getfile: @echo $@ |