Merge branch 'gawk-4.1-stable'

4 files changed, 46 insertions, 15 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 1aafb685..a04e4064 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* fts.awk: Skip atime to avoid spurious timestamp
+	differences. Thanks to Nelson Beebe for pointing this out.
+	* Makefile.am (charset-all): Group the charset tests
+	inside a check for locale support. Thanks to Nelson Beebe
+	for finally motivating me to do this.
+	(charset-msg-start): Update test of message some.
+
 2015-04-08  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.am (mpfrmemok1): Use -p- for portability and
diff --git a/test/Makefile.am b/test/Makefile.am
index f6b31fbd..d7e96353 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1145,7 +1145,7 @@ check:	msg \
 	unix-msg-start   unix-tests      unix-msg-end \
 	extend-msg-start gawk-extensions extend-msg-end \
 	machine-msg-start machine-tests machine-msg-end \
-	charset-msg-start charset-tests charset-msg-end \
+	charset-tests-all \
 	shlib-msg-start  shlib-tests     shlib-msg-end \
 	mpfr-msg-start   mpfr-tests      mpfr-msg-end
 	@$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; }
@@ -1156,6 +1156,16 @@ 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 '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. ; \
+	fi
+
 charset-tests: $(LOCALE_CHARSET_TESTS)
 
 extra:	$(EXTRA_TESTS) inet
@@ -1218,12 +1228,12 @@ machine-msg-end:
 
 charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
-	@echo "************************************************"
-	@echo "** Some or all of these tests may fail if you **"
-	@echo "** have inadequate or missing locale support  **"
-	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
-	@echo "** ja_JP.UTF-8 are needed.                    **"
-	@echo "************************************************"
+	@echo "**************************************************************************"
+	@echo "* Some or all of these tests may fail if you have inadequate or missing  *"
+	@echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are   *"
+	@echo "* needed. However, if you see this message, the Makefile thinks you have *"
+	@echo "* what you need ...                                                      *"
+	@echo "**************************************************************************"
 
 charset-msg-end:
 	@echo "======== Done with tests that can vary based on character set or locale support ========"
diff --git a/test/Makefile.in b/test/Makefile.in
index 6ed60596..5c7314f1 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1585,7 +1585,7 @@ check:	msg \
 	unix-msg-start   unix-tests      unix-msg-end \
 	extend-msg-start gawk-extensions extend-msg-end \
 	machine-msg-start machine-tests machine-msg-end \
-	charset-msg-start charset-tests charset-msg-end \
+	charset-tests-all \
 	shlib-msg-start  shlib-tests     shlib-msg-end \
 	mpfr-msg-start   mpfr-tests      mpfr-msg-end
 	@$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; }
@@ -1596,6 +1596,16 @@ 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 '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. ; \
+	fi
+
 charset-tests: $(LOCALE_CHARSET_TESTS)
 
 extra:	$(EXTRA_TESTS) inet
@@ -1658,12 +1668,12 @@ machine-msg-end:
 
 charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
-	@echo "************************************************"
-	@echo "** Some or all of these tests may fail if you **"
-	@echo "** have inadequate or missing locale support  **"
-	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
-	@echo "** ja_JP.UTF-8 are needed.                    **"
-	@echo "************************************************"
+	@echo "**************************************************************************"
+	@echo "* Some or all of these tests may fail if you have inadequate or missing  *"
+	@echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are   *"
+	@echo "* needed. However, if you see this message, the Makefile thinks you have *"
+	@echo "* what you need ...                                                      *"
+	@echo "**************************************************************************"
 
 charset-msg-end:
 	@echo "======== Done with tests that can vary based on character set or locale support ========"
diff --git a/test/fts.awk b/test/fts.awk
index 70af560f..b1df0600 100644
--- a/test/fts.awk
+++ b/test/fts.awk
@@ -69,7 +69,9 @@ function traverse(data,         i)
 				traverse(data[i])
 			}
 			Level--
-		} else {
+		} else if (data[i] != "atime") {
+			# 4/2015: skip for atime, since there can
+			# occasionally be small differences.
 			indent()
 			printf("%s --> %s\n", i, data[i]) > output
 		}