aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog7
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.in2
-rwxr-xr-xtest/jarebug.sh2
4 files changed, 10 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 031bbd1d..5a377399 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-20 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (readdir): Add -a to ls options. -f does not
+ automatically mean -a on all systems.
+ * jarebug.sh: Send error output of locale to /dev/null in case
+ it doesn't exist.
+
2013-03-11 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (colonwarn): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1859932e..64823b5f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1757,7 +1757,7 @@ testext::
readdir:
@echo $@
@$(AWK) -f $(srcdir)/readdir.awk $(top_srcdir) > _$@
- @ls -fli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok
+ @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
diff --git a/test/Makefile.in b/test/Makefile.in
index f320a720..b7b443d0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2137,7 +2137,7 @@ testext::
readdir:
@echo $@
@$(AWK) -f $(srcdir)/readdir.awk $(top_srcdir) > _$@
- @ls -fli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok
+ @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
diff --git a/test/jarebug.sh b/test/jarebug.sh
index dcc73e6c..6dc728a6 100755
--- a/test/jarebug.sh
+++ b/test/jarebug.sh
@@ -11,7 +11,7 @@ cp $infile $out # set up default
for locale in ja_JP.EUC-JP ja_JP.eucJP
do
- if locale -a | grep $locale > /dev/null
+ if locale -a 2>/dev/null | grep $locale > /dev/null
then
LANG=$locale
LC_ALL=$locale