summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorAdam Sampson <ats@offog.org>2012-07-10 15:08:15 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-07-10 15:08:36 +0200
commitcf80959825ac3b18271d0c15ce7345e64410c2f0 (patch)
tree5f5c2c6d21a1641f0f52ca14855f03ccbf9a156d /t
parent1c8bf11bc8db57ef8e33cff04cb6029143b93ac8 (diff)
downloadautomake-cf80959825ac3b18271d0c15ce7345e64410c2f0.tar.gz
tests: fix spurious failure in aclocal7.sh on fast machines
Fixes automake bug#11896. Issue introduced in commit v1.12.1-46-g13dd512. * t/aclocal7.sh: Since aclocal rewrites aclocal.m4 unless the input files are all older than the existing aclocal.m4, so we must sleep to ensure somedefs.m4 has an older timestamp than the aclocal.m4 the next aclocal call will generate. Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't')
-rwxr-xr-xt/aclocal7.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/aclocal7.sh b/t/aclocal7.sh
index 4c03a0c4e..c050b07d1 100755
--- a/t/aclocal7.sh
+++ b/t/aclocal7.sh
@@ -45,6 +45,11 @@ AUTOMAKE_after_aclocal ()
$AUTOMAKE --no-force
}
+# aclocal will rewrite aclocal.m4 unless the input files are all older than the
+# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp
+# than the aclocal.m4 that the next aclocal call will generate.
+$sleep
+
$ACLOCAL -I m4
AUTOMAKE_after_aclocal