From c9a018c38fa4ff9abf4976398921f315be37b881 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 21 May 2015 14:36:12 +0300 Subject: Fix fts test to not include atime. --- test/ChangeLog | 5 +++++ test/fts.awk | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index 738c1af7..be92aac9 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-05-21 Arnold D. Robbins + + * fts.awk: Really remove atime from the output. + This avoids spurious failures on heavily loaded systems. + 2015-05-19 Arnold D. Robbins * 4.1.3: Release tar ball made. 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 +# } } } } -- cgit v1.2.3 From b8a83849a4871b5ecb186d2bb60e2541a75910ac Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 21 May 2015 14:37:58 +0300 Subject: Improve error message if inadequate locale support. --- test/ChangeLog | 3 +++ test/Makefile.am | 3 ++- test/Makefile.in | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index be92aac9..ca868bfc 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -3,6 +3,9 @@ * 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 * 4.1.3: Release tar ball made. diff --git a/test/Makefile.am b/test/Makefile.am index 8838b700..4a66a1fa 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1156,6 +1156,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) @@ -1222,7 +1223,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 4c0fd9e1..98175bf7 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1596,6 +1596,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) @@ -1662,7 +1663,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 "**************************************************************************" -- cgit v1.2.3