From cf80959825ac3b18271d0c15ce7345e64410c2f0 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Tue, 10 Jul 2012 15:08:15 +0200 Subject: [PATCH] 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 --- t/aclocal7.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/t/aclocal7.sh b/t/aclocal7.sh index 4c03a0c..c050b07 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 -- 2.7.4