From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 27 Jan 2012 20:03:45 +0000 (+0100)
Subject: tests: avoid spurious failure of deleted-am.test with FreeBSD make
X-Git-Tag: v1.11.3~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d55b9302515d68c178259048df592f0a80d1d67d;p=thirdparty%2Fautomake.git

tests: avoid spurious failure of deleted-am.test with FreeBSD make

* tests/deleted-am.test: Sleep between the removal of the included
'.am' fragments and the subsequent "make" calls, to ensure that the
remake rules kick in.  This is required to avoid racy spurious
failures (~ 60% of the time) with FreeBSD make.
---

diff --git a/tests/deleted-am.test b/tests/deleted-am.test
index fa41e9e10..1e8d11a60 100755
--- a/tests/deleted-am.test
+++ b/tests/deleted-am.test
@@ -37,6 +37,7 @@ $AUTOMAKE
 $MAKE
 
 rm -f zardoz.am
+$sleep # Required to avoid racy failures with FreeBSD make.
 $MAKE >output 2>&1 && { cat output; Exit 1; }
 cat output
 # This error will come from automake, not make, so we can be stricter
@@ -44,12 +45,13 @@ cat output
 grep 'cannot open.*zardoz\.am' output
 grep 'foobar\.am' output && Exit 1 # No spurious error, please.
 
-# Try  with one less indirection.
+# Try with one less indirection.
 : > foobar.am
 $AUTOMAKE Makefile
 ./config.status Makefile
 $MAKE # Sanity check.
 rm -f foobar.am
+$sleep # Required to avoid racy failures with FreeBSD make.
 $MAKE >output 2>&1 && { cat output; Exit 1; }
 cat output
 # This error will come from automake, not make, so we can be stricter