[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI] {micro} tests: avoid a couple of extra sleep with GNU make
From: |
Stefano Lattarini |
Subject: |
[FYI] {micro} tests: avoid a couple of extra sleep with GNU make |
Date: |
Sun, 26 May 2013 11:36:55 +0200 |
They are only required by BSD make in order to avoid spurious failures.
* t/deleted-am.sh: Here.
* t/parallel-tests-recheck-pr11791.sh: And here.
Signed-off-by: Stefano Lattarini <address@hidden>
---
t/deleted-am.sh | 4 ++--
t/parallel-tests-recheck-pr11791.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
index 980a27a..837e10f 100644
--- a/t/deleted-am.sh
+++ b/t/deleted-am.sh
@@ -35,7 +35,7 @@ $AUTOMAKE
$MAKE
rm -f zardoz.am
-$sleep # Required to avoid racy failures with FreeBSD make.
+using_gmake || $sleep # Required by BSD make.
run_make -e FAIL -M
# This error will come from automake, not make, so we can be stricter
# in our grepping of it.
@@ -48,7 +48,7 @@ $AUTOMAKE Makefile
./config.status Makefile
$MAKE # Sanity check.
rm -f foobar.am
-$sleep # Required to avoid racy failures with FreeBSD make.
+using_gmake || $sleep # Required by BSD make.
run_make -e FAIL -M
# This error will come from automake, not make, so we can be stricter
# in our grepping of it.
diff --git a/t/parallel-tests-recheck-pr11791.sh
b/t/parallel-tests-recheck-pr11791.sh
index f14288c..1933aa9 100644
--- a/t/parallel-tests-recheck-pr11791.sh
+++ b/t/parallel-tests-recheck-pr11791.sh
@@ -41,7 +41,7 @@ $AUTOMAKE -a
run_make -O -e FAIL check
count_test_results total=1 pass=0 fail=1 xpass=0 xfail=0 skip=0 error=0
-$sleep # Required to avoid a spurious failure with some FreeBSD makes.
+using_gmake || $sleep # Required by BSD make.
run_make -O -e IGNORE -- -k recheck
# Don't trust the exit status of "make -k" for non-GNU makes.
! using_gmake || test $am_make_rc -gt 0 || exit 1
@@ -59,7 +59,7 @@ $EGREP '(X?PASS|X?FAIL|SKIP|ERROR):' stdout && exit 1
test -f foo.log
test -f foo.trs
-$sleep # Required to avoid a spurious failure with some FreeBSD makes.
+using_gmake || $sleep # Required by BSD make.
run_make -O -e IGNORE -- -k recheck
# Don't trust the exit status of "make -k" for non-GNU makes.
! using_gmake || test $am_make_rc -gt 0 || exit 1
--
1.8.3.rc3.8.g5e49f30
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [FYI] {micro} tests: avoid a couple of extra sleep with GNU make,
Stefano Lattarini <=