Merge branch 'gawk-4.1-stable'

4 files changed, 26 insertions, 8 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index bec09440..47a6ed01 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2015-05-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* fts.awk: Really remove atime from the output. 
+	This avoids spurious failures on heavily loaded systems.
+
+	* Makefile.am: Add list of needed locales to "inadequate locale
+	support" message.
+
 2015-05-19         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.3: Release tar ball made.
diff --git a/test/Makefile.am b/test/Makefile.am
index 68ded6cd..fe30cb41 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1179,6 +1179,7 @@ charset-tests-all:
 		$(MAKE) charset-msg-start charset-tests charset-msg-end; \
 	else \
 		echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \
+		echo %%%%%%%%%% At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
 	fi
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -1245,7 +1246,7 @@ 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 have inadequate or missing  *"
-	@echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are   *"
+	@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 "**************************************************************************"
diff --git a/test/Makefile.in b/test/Makefile.in
index 139d1e09..cddc7a5e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1619,6 +1619,7 @@ charset-tests-all:
 		$(MAKE) charset-msg-start charset-tests charset-msg-end; \
 	else \
 		echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \
+		echo %%%%%%%%%% At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
 	fi
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -1685,7 +1686,7 @@ 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 have inadequate or missing  *"
-	@echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are   *"
+	@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 "**************************************************************************"
diff --git a/test/fts.awk b/test/fts.awk
index b1df0600..dea5b684 100644
--- a/test/fts.awk
+++ b/test/fts.awk
@@ -50,6 +50,11 @@ function sort_traverse(data,	sorted, i)
 {
 	asorti(data, sorted)
 	for (i = 1; i in sorted; i++) {
+		# 5/2015: skip for atime, since there can
+		# occasionally be small differences.
+		if (sorted[i] == "atime")
+			continue
+
 		indent()
 		printf("%s --> %s\n", sorted[i], data[sorted[i]]) > output
 	}
@@ -63,17 +68,20 @@ function traverse(data,         i)
 			printf("%s:\n", i) > output
 
 			Level++
-			if (("mtime" in data[i]) && ! isarray(data[i][mtime])) {
+			if (("mtime" in data[i]) && ! isarray(data[i]["mtime"])) {
 				sort_traverse(data[i])
 			} else {
 				traverse(data[i])
 			}
 			Level--
-		} 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
+#		} else {
+#			JUNK = 1
+#			if (i != "atime") {
+#				# 4/2015: skip for atime, since there can
+#				# occasionally be small differences.
+#				indent()
+#				printf("%s --> %s\n", i, data[i]) > output
+#			}
 		}
 	}
 }