From dabdb014914477f54049468b47fa6bf8a2d2f8e5 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 27 Jun 2012 15:07:03 +0200 Subject: [PATCH] tests: fix a spurious failure with Solaris make * t/subdir-order.sh: Run make in parallel only if the make implementation truly supports it. Signed-off-by: Stefano Lattarini --- t/subdir-order.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/t/subdir-order.sh b/t/subdir-order.sh index 0321c25c6..4c843cfd9 100644 --- a/t/subdir-order.sh +++ b/t/subdir-order.sh @@ -124,6 +124,17 @@ all-local: : > run END +echo dummy: > Makefile +if using_gmake; then + jobs=-j12 +elif $MAKE -j12; then + jobs=-j12 +elif $MAKE -j 12; then + jobs="-j 12" +else + jobs=none +fi +rm -f Makefile $ACLOCAL $AUTOCONF @@ -131,7 +142,8 @@ $AUTOMAKE -c --add-missing ./configure -for j in '' -j12; do +for j in '' "$jobs"; do + test x"$j" = x"none" && continue $MAKE $j test -f run test -f sub0/run -- 2.47.2