[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.1-63-gdabdb01

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=dabdb014914477f54049468b47fa6bf8a2d2f8e5

The branch, maint has been updated
       via  dabdb014914477f54049468b47fa6bf8a2d2f8e5 (commit)
      from  aa630a928a586fd8dc8a087337c3462d7f4fd1c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dabdb014914477f54049468b47fa6bf8a2d2f8e5
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 27 15:07:03 2012 +0200

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 t/subdir-order.sh |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/t/subdir-order.sh b/t/subdir-order.sh
index 0321c25..4c843cf 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


hooks/post-receive
-- 
GNU Automake