From 2d1f1043e900a746f57c34467d4de8b48e4efc8b Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 6 Jul 2012 23:22:03 +0200 Subject: [PATCH] fixup: another "make recheck" failure with BSD make * t/parallel-tests-log-override-recheck.sh: Here, add a proper $sleep before calling "make recheck". This should ideally have been done in the earlier commit 'v1.12.1-100-g19d84bc', but it somehow slipped through the cracks. * t/test-metadata-recheck.sh: Likewise. Signed-off-by: Stefano Lattarini --- t/parallel-tests-log-override-recheck.sh | 2 ++ t/test-metadata-recheck.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/t/parallel-tests-log-override-recheck.sh b/t/parallel-tests-log-override-recheck.sh index 79c16fc..a6ab216 100755 --- a/t/parallel-tests-log-override-recheck.sh +++ b/t/parallel-tests-log-override-recheck.sh @@ -64,6 +64,8 @@ filter_stdout () $MAKE check >stdout && { cat stdout; exit 1; } cat stdout +using_gmake || $sleep # Required by BSD make. + chmod a-rw test-suite.log TEST_SUITE_LOG=my.log $MAKE -e recheck >stdout \ && { cat stdout; exit 1; } diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh index 8675747..4f2d29b 100755 --- a/t/test-metadata-recheck.sh +++ b/t/test-metadata-recheck.sh @@ -153,6 +153,7 @@ rm -f *.run # fields indicating success, so "make recheck" must pass. Still, the # next "make recheck" call should still re-run the same set of tests. for iteration in 1 2; do + using_gmake || $sleep # Required by BSD make. $MAKE recheck ls -l for t in $rechecked; do test -f $t.run; done -- 2.7.4