[gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1.0-3109-g9fc401a

[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, feature/improve-tests has been updated
       via  9fc401a569239084f0d9caee46abe9800e2622ae (commit)
      from  ac9ba2e1dd7f059fb2c6d5f103fd26b492006727 (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=9fc401a569239084f0d9caee46abe9800e2622ae

commit 9fc401a569239084f0d9caee46abe9800e2622ae
Author: Arnold D. Robbins <address@hidden>
Date:   Sun May 6 21:34:59 2018 -0400

    Continue improvements to sync with PC tests.

diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index fc16f64..5491c8b 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -966,15 +966,15 @@ readdir:
 readdir_test:
        @echo $@
        @echo Expect $@ to fail with MinGW.
-       @$(AWK) -lreaddir -F/ '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, 
$$4}' "$(top_srcdir)" > address@hidden
+       @$(AWK) -lreaddir -F$(SLASH) '{printf "[%s] [%s] [%s] [%s]\n", $$1, 
$$2, $$3, $$4}' "$(top_srcdir)" > address@hidden
        @$(AWK) -lreaddir_test '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, 
$$4}' "$(top_srcdir)" > _$@
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
 readdir_retest:
        @echo $@
        @echo Expect $@ to fail with MinGW.
-       @$(AWK) -lreaddir -F/ -f "$(srcdir)"/address@hidden "$(top_srcdir)" > 
address@hidden
-       @$(AWK) -lreaddir_test -F/ -f "$(srcdir)"/address@hidden 
"$(top_srcdir)" > _$@
+       @$(AWK) -lreaddir -F$(SLASH) -f "$(srcdir)"/address@hidden 
"$(top_srcdir)" > address@hidden
+       @$(AWK) -lreaddir_test -F$(SLASH) -f "$(srcdir)"/address@hidden 
"$(top_srcdir)" > _$@
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
 fts:
diff --git a/test/ChangeLog b/test/ChangeLog
index 7e9ede8..12cfdf0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-06         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (SORT): New variable, to improve consistency with
+       PC test suite.
+       (profile2): Use $(SORT) instead of literal "sort".
+       (msg): Use $(CMP) in message instead of literal "cmp".
+       Thanks to Eli Z. for the suggested changes.
+
 2018-05-03         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (EXPECTED_FAIL_MINGW): Per Eli Z., remove clos1way5.
diff --git a/test/Makefile.am b/test/Makefile.am
index 7edeaf7..e9298f6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1414,6 +1414,7 @@ NEED_TESTOUTCMP = \
 
 CMP = cmp
 AWKPROG = ../gawk$(EXEEXT)
+SORT = sort
 
 # Default for VALGRIND is empty unless overridden by a command-line argument.
 # This protects against cruft in the environment.
@@ -1501,7 +1502,7 @@ shlib-real-tests: $(SHLIB_TESTS)
 
 msg::
        @echo ''
-       @echo 'Any output from "cmp" is bad news, although some differences'
+       @echo 'Any output from "$(CMP)" is bad news, although some differences'
        @echo 'in floating point values are probably benign -- in particular,'
        @echo 'some systems may omit a leading zero and the floating point'
        @echo 'precision may lead to slightly different output in a few cases.'
@@ -1877,7 +1878,7 @@ profile1:
 
 profile2:
        @echo $@
-       @$(AWK) address@hidden -v sortcmd=sort -f "$(srcdir)"/xref.awk 
"$(srcdir)"/dtdgport.awk > /dev/null
+       @$(AWK) address@hidden -v sortcmd=$(SORT) -f "$(srcdir)"/xref.awk 
"$(srcdir)"/dtdgport.awk > /dev/null
        @sed 1,2d < address@hidden > _$@; rm address@hidden
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 39e6ea1..87cec0d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1675,6 +1675,7 @@ NEED_TESTOUTCMP = \
 
 CMP = cmp
 AWKPROG = ../gawk$(EXEEXT)
+SORT = sort
 
 # Default for VALGRIND is empty unless overridden by a command-line argument.
 # This protects against cruft in the environment.
@@ -1947,7 +1948,7 @@ shlib-real-tests: $(SHLIB_TESTS)
 
 msg::
        @echo ''
-       @echo 'Any output from "cmp" is bad news, although some differences'
+       @echo 'Any output from "$(CMP)" is bad news, although some differences'
        @echo 'in floating point values are probably benign -- in particular,'
        @echo 'some systems may omit a leading zero and the floating point'
        @echo 'precision may lead to slightly different output in a few cases.'
@@ -2322,7 +2323,7 @@ profile1:
 
 profile2:
        @echo $@
-       @$(AWK) address@hidden -v sortcmd=sort -f "$(srcdir)"/xref.awk 
"$(srcdir)"/dtdgport.awk > /dev/null
+       @$(AWK) address@hidden -v sortcmd=$(SORT) -f "$(srcdir)"/xref.awk 
"$(srcdir)"/dtdgport.awk > /dev/null
        @sed 1,2d < address@hidden > _$@; rm address@hidden
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 

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

Summary of changes:
 pc/Makefile.tst  | 6 +++---
 test/ChangeLog   | 8 ++++++++
 test/Makefile.am | 5 +++--
 test/Makefile.in | 5 +++--
 4 files changed, 17 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
gawk