Avoid timestamp races for updated input.

* tests/m4sh.at (AS_IF and AS_CASE): Use `autom4te --force' for
second script.  Set the expansion limit back to 1000.
* tests/tools.at (autotools and whitespace in file names): Add
--force for repeated invocations.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index f15cbf70d4e123e289423965163bd85ed5439ddb..7fdd8977ef67fbd2d1b4bea497eeeb6e4e8ec469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Avoid timestamp races for updated input.
+       * tests/m4sh.at (AS_IF and AS_CASE): Use `autom4te --force' for
+       second script.
+       * tests/tools.at (autotools and whitespace in file names): Add
+       --force for repeated invocations.
+
 2008-08-20  Bruno Haible  <bruno@clisp.org>
 
        Add section to INSTALL about particular systems.

diff --git a/tests/m4sh.at b/tests/m4sh.at
index f64d8329957ccde4cfd398470cd2d883b0a5be3c..acaa11ec93188451ccab1421c5a6b985b1d7a7e5 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -739,7 +739,8 @@ AS_CASE([$[1]]m4_for([i], [1], ]limit[, [], [, i, echo i]))
 AS_CASE([$[1]]m4_for([i], [1], ]limit[, [], [, i, echo i]), [echo default])
 ]])
 
-AT_CHECK_M4SH
+dnl Add --force so autom4te doesn't think `script' is still up to date.
+AT_CHECK_M4SH([--force])
 AT_CHECK([./script 1], [0], [[1
 1
 1

diff --git a/tests/tools.at b/tests/tools.at
index 9e136893e37141a572ffab611de06e33d052b4b8..6285f3dfa0839f7c99e6ec249a505d22ffe897a2 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1016,9 +1016,9 @@ END
 END
 
   AT_CHECK_AUTOHEADER([-B "$dir" "$file.in"])
-  AT_CHECK_AUTOHEADER([-I "$dir" "$file.in"])
+  AT_CHECK_AUTOHEADER([--force -I "$dir" "$file.in"])
   AT_CHECK_AUTOUPDATE([-B "$dir" "$file.in"])
-  AT_CHECK_AUTOUPDATE([-I "$dir" "$file.in"])
+  AT_CHECK_AUTOUPDATE([--force -I "$dir" "$file.in"])
   AT_CHECK_AUTOUPDATE([-B "$dir" - < "$file.in"], [], [ignore])
   AT_CHECK_AUTOCONF([-B "$dir" -o "$file" "$file.in"])
   AT_CHECK_AUTOCONF([-I "$dir" -o "$file" "$file.in"])
@@ -1026,12 +1026,12 @@ END
   AT_CHECK_AUTOCONF([--prepend-include="$dir" -o "$file" "$file.in"])
   AT_CHECK_AUTOCONF([--include="$dir" -o "$file" "$file.in"])
   AT_CHECK([autoscan -B "$dir"], [], [], [ignore])
-  AT_CHECK([autoscan -I "$dir"], [], [], [ignore])
+  AT_CHECK([autoscan --force -I "$dir"], [], [], [ignore])
   # autoreconf requires a sane input file name.  Also, disable aclocal.
   mv -f "$file.in" configure.in
   AT_DATA([aclocal.m4])
   AT_CHECK([autoreconf -B "$dir"])
-  AT_CHECK([autoreconf -I "$dir"])
+  AT_CHECK([autoreconf --force -I "$dir"])
 
   cat >"$file.c" <<'END'
 #if FOO