[gawk-diffs] [SCM] gawk branch, master, updated. 5cd82ccd7a2241276eec41ce813a658442ca4fb1

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  5cd82ccd7a2241276eec41ce813a658442ca4fb1 (commit)
      from  0edba9c48374579777c298b11cc351c4c1634dc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=5cd82ccd7a2241276eec41ce813a658442ca4fb1

commit 5cd82ccd7a2241276eec41ce813a658442ca4fb1
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Jan 16 20:41:34 2013 +0200

    Make more tests work with make diffout.

diff --git a/TODO b/TODO
index 47f1c6d..bee961c 100644
--- a/TODO
+++ b/TODO
@@ -24,10 +24,6 @@ Minor Cleanups and Code Improvements
 
        regex.h - remove underscores in param names
 
-       From Andy: Review the following test cases that they work with
-       make diffout.  These look suspicious: mmap8k, fmtspcl (the mpfr
-       case), clobber, getlnbuf, rtlenmb, profile1, rand (mpfr case).
-
        Add tests for patches in emails (?? - not sure now what this
        referred to)
 
diff --git a/test/ChangeLog b/test/ChangeLog
index ef51fd6..077d631 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-16         Arnold D. Robbins     <address@hidden>
+
+       Fix tests to work with make diffout:
+
+       * Makefile.am (clobber, mmap8k, rtlenmb): Tests adjusted.
+       * rtlenmb.ok: New file.
+
 2013-01-15         Andrew J. Schorr     <address@hidden>
 
        * Gentests: Remove a debugging printf.
diff --git a/test/Makefile.am b/test/Makefile.am
index b82b604..b1bca55 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1220,7 +1220,7 @@ tweakfld::
 mmap8k::
        @echo $@
        @$(AWK) '{ print }' $(srcdir)/mmap8k.in >_$@
-       @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ || cp 
$(srcdir)/address@hidden address@hidden
 
 tradanch::
        @echo $@
@@ -1443,7 +1443,7 @@ rtlenmb::
        @echo $@
        @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
        $(srcdir)/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) $(srcdir)/rtlen.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 nondec2::
        @echo $@
@@ -1563,7 +1563,9 @@ profile1:
        @echo $@
        @$(AWK) address@hidden -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > 
address@hidden
        @$(AWK) -f address@hidden $(srcdir)/dtdgport.awk > address@hidden ; rm 
address@hidden
-       @cmp address@hidden address@hidden && rm address@hidden || echo EXIT 
CODE: $$? >>_$@
+       @$(CMP) address@hidden address@hidden && rm address@hidden || { echo 
EXIT CODE: $$? >>_$@ ; \
+       cp $(srcdir)/dtdgport.awk > address@hidden ; }
+       
 
 profile2:
        @echo $@
@@ -1760,7 +1762,9 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am 
$(srcdir)/Gentests
        $(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > 
$(srcdir)/Maketests
 
 clean:
-       rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 seq *~ 
readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok
+       rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \
+       seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \
+       mmap8k.ok profile1.ok
 
 # An attempt to print something that can be grepped for in build logs
 pass-fail:
diff --git a/test/Makefile.in b/test/Makefile.in
index edc472c..5d7fb87 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1601,7 +1601,7 @@ tweakfld::
 mmap8k::
        @echo $@
        @$(AWK) '{ print }' $(srcdir)/mmap8k.in >_$@
-       @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ || cp 
$(srcdir)/address@hidden address@hidden
 
 tradanch::
        @echo $@
@@ -1824,7 +1824,7 @@ rtlenmb::
        @echo $@
        @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
        $(srcdir)/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) $(srcdir)/rtlen.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 nondec2::
        @echo $@
@@ -1944,7 +1944,8 @@ profile1:
        @echo $@
        @$(AWK) address@hidden -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > 
address@hidden
        @$(AWK) -f address@hidden $(srcdir)/dtdgport.awk > address@hidden ; rm 
address@hidden
-       @cmp address@hidden address@hidden && rm address@hidden || echo EXIT 
CODE: $$? >>_$@
+       @$(CMP) address@hidden address@hidden && rm address@hidden || { echo 
EXIT CODE: $$? >>_$@ ; \
+       cp $(srcdir)/dtdgport.awk > address@hidden ; }
 
 profile2:
        @echo $@
@@ -3474,7 +3475,9 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am 
$(srcdir)/Gentests
        $(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > 
$(srcdir)/Maketests
 
 clean:
-       rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 seq *~ 
readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok
+       rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \
+       seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \
+       mmap8k.ok profile1.ok
 
 # An attempt to print something that can be grepped for in build logs
 pass-fail:
diff --git a/test/rtlenmb.ok b/test/rtlenmb.ok
new file mode 100644
index 0000000..b8a484d
--- /dev/null
+++ b/test/rtlenmb.ok
@@ -0,0 +1,3 @@
+3
+5
+2

-----------------------------------------------------------------------

Summary of changes:
 TODO                          |    4 ----
 test/ChangeLog                |    7 +++++++
 test/Makefile.am              |   12 ++++++++----
 test/Makefile.in              |   11 +++++++----
 test/{rtlen.ok => rtlenmb.ok} |    0
 5 files changed, 22 insertions(+), 12 deletions(-)
 copy test/{rtlen.ok => rtlenmb.ok} (100%)


hooks/post-receive
-- 
gawk