Avoid MacOS readdir bug in testsuite.

* tests/local.at (AC_STATE_SAVE): Avoid spurious failures due to
duplicated ls entries.
* THANKS: Update.
Reported by Bruce Dugan and others.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 2db458df254145c1df3119df9aae61daf5ffb0ee..7ca53e90ed80ec6a95a4dc35f51118cbd75a4a0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-02  Eric Blake  <ebb9@byu.net>
+
+       Avoid MacOS readdir bug in testsuite.
+       * tests/local.at (AC_STATE_SAVE): Avoid spurious failures due to
+       duplicated ls entries.
+       * THANKS: Update.
+       Reported by Bruce Dugan and others.
+
 2008-11-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/autotest/general.m4 (AT_JOB_FIFO_FD): Hide zsh 4.3.4

diff --git a/THANKS b/THANKS
index bd394e199e82e500acf17b5ab7959fe2c237b742..a3ae8c27fb0eaf3e1fc5de0179ba16c820865230 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ Brad Walker                 me@bradmwalker.com
 Braden McDaniel             braden@endoframe.com
 Bram Moolenaar              bram@vim.org
 Brian Gough                 bjg@network-theory.co.uk
+Bruce Dugan                 bld0401@gmail.com
 Bruce Korb                  bkorb@gnu.org
 Bruce Lilly                 ?
 Bruno Haible                haible@ilog.fr

diff --git a/tests/local.at b/tests/local.at
index 041d1035bba3447335121b02956cc086c41e0b87..2ec7bc5a2fd6d3d9cc61a0fe9075f9f586d04385 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -197,9 +197,11 @@ m4_define([AT_CONFIGURE_AC],
 # confirm that no test modifies variables outside the Autoconf namespace or
 # leaves temporary files.  AT_CONFIG_CMP uses the variable dumps to confirm that
 # tests have the same side effects regardless of caching.
+# The sort -u is necessary, since MacOS 10.5 has a bug where readdir can
+# list a file multiple times in a rapidly changing directory.
 m4_defun([AC_STATE_SAVE],
 [(set) 2>&1 | sort >state-env.$][1
-ls -1 | sed '/^at-/d;/^state-/d;/^config\./d' | sort >state-ls.$][1
+ls -1 | sed '/^at-/d;/^state-/d;/^config\./d' | sort -u >state-ls.$][1
 ])# AC_STATE_SAVE
 ]])