From: Eric Blake Date: Tue, 2 Dec 2008 18:15:55 +0000 (-0700) Subject: Avoid MacOS readdir bug in testsuite. X-Git-Tag: v2.63b~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af7366502f5d298e63bc02ca4516186b8acf7f6c;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index 2db458df2..7ca53e90e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-02 Eric Blake + + 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 * lib/autotest/general.m4 (AT_JOB_FIFO_FD): Hide zsh 4.3.4 diff --git a/THANKS b/THANKS index bd394e199..a3ae8c27f 100644 --- 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 041d1035b..2ec7bc5a2 100644 --- 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 ]])