[gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1.0-3093-g0600528

[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  0600528110146ed47517e3e15550c660270705b2 (commit)
      from  efca1a52fd8f17ac5793ab5b9f78e711a8ff951f (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=0600528110146ed47517e3e15550c660270705b2

commit 0600528110146ed47517e3e15550c660270705b2
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 19 18:43:20 2018 +0300

    Further improvements for MinGW.

diff --git a/test/ChangeLog b/test/ChangeLog
index 44480dd..e4737f2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -2,6 +2,10 @@
 
        * Makefile.am (EXPECTED_FAIL_MINGW): Add clos1way6.
        (readdir, fts): Move the 'echo $@' to be the first line.
+       (nonfatal1): Adapt inline awk script to work with MSYS too.
+       (charset-tests-all): Check for MinGW or DJGPP and just run
+       the tests if so, otherwise check for needed locales as
+       previously.
 
 2018-04-19         Arnold D. Robbins     <address@hidden>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index c2f29bf..20ba969 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1450,16 +1450,21 @@ unix-tests: $(UNIX_TESTS)
 gawk-extensions: $(GAWK_EXT_TESTS)
 
 charset-tests-all:
-       @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \
-           locale -a | grep -i 'fr_FR.UTF.*8' > /dev/null && \
-           locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \
-           locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null  ; \
-       then \
-               $(MAKE) charset-msg-start charset-tests charset-msg-end; \
-       else \
-               echo %%%%%%%%%% Inadequate locale support: skipping charset 
tests. ; \
-               echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 
and ja_JP.UTF-8 are needed. ; \
-       fi
+       @case `uname` in \
+       *MINGW* | *MS-DOS*) \
+               $(MAKE) charset-msg-start charset-tests charset-msg-end ;; \
+       *) \
+               if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'fr_FR.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null  ; \
+               then \
+                       $(MAKE) charset-msg-start charset-tests 
charset-msg-end; \
+               else \
+                       echo %%%%%%%%%% Inadequate locale support: skipping 
charset tests. ; \
+                       echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, 
ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
+               fi ;; \
+       esac
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
 
@@ -2166,9 +2171,10 @@ sourcesplit:
        @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# Use [:] in the regexp to keep MSYS from converting the /'s to \'s.
 nonfatal1:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid:.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 nlstringtest::
diff --git a/test/Makefile.in b/test/Makefile.in
index 3080c45..4bdeeb3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1896,16 +1896,21 @@ unix-tests: $(UNIX_TESTS)
 gawk-extensions: $(GAWK_EXT_TESTS)
 
 charset-tests-all:
-       @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \
-           locale -a | grep -i 'fr_FR.UTF.*8' > /dev/null && \
-           locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \
-           locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null  ; \
-       then \
-               $(MAKE) charset-msg-start charset-tests charset-msg-end; \
-       else \
-               echo %%%%%%%%%% Inadequate locale support: skipping charset 
tests. ; \
-               echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 
and ja_JP.UTF-8 are needed. ; \
-       fi
+       @case `uname` in \
+       *MINGW* | *MS-DOS*) \
+               $(MAKE) charset-msg-start charset-tests charset-msg-end ;; \
+       *) \
+               if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'fr_FR.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null  ; \
+               then \
+                       $(MAKE) charset-msg-start charset-tests 
charset-msg-end; \
+               else \
+                       echo %%%%%%%%%% Inadequate locale support: skipping 
charset tests. ; \
+                       echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, 
ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
+               fi ;; \
+       esac
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
 
@@ -2609,9 +2614,10 @@ sourcesplit:
        @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# Use [:] in the regexp to keep MSYS from converting the /'s to \'s.
 nonfatal1:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid:.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 nlstringtest::

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

Summary of changes:
 test/ChangeLog   |  4 ++++
 test/Makefile.am | 28 +++++++++++++++++-----------
 test/Makefile.in | 28 +++++++++++++++++-----------
 3 files changed, 38 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
gawk