diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-27 21:03:45 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-28 08:06:40 +0100 |
commit | d55b9302515d68c178259048df592f0a80d1d67d (patch) | |
tree | 76f9148dc97a1af7a586288638d8b250cda03e60 | |
parent | be0a696aac24a55f8281e9585c87a14138206eb5 (diff) | |
download | automake-d55b9302515d68c178259048df592f0a80d1d67d.tar.gz |
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.
-rwxr-xr-x | tests/deleted-am.test | 4 |
1 files changed, 3 insertions, 1 deletions
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 |