[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1852-g2c430b1

[Peter Rosin]

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=2c430b160d34f6d27bdbf92dbde3b7fbae8b12a9

The branch, master has been updated
       via  2c430b160d34f6d27bdbf92dbde3b7fbae8b12a9 (commit)
      from  79b2c6a58577662070f8f8827f5e6f665ebd102a (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 2c430b160d34f6d27bdbf92dbde3b7fbae8b12a9
Author: Peter Rosin <address@hidden>
Date:   Tue Feb 14 02:51:55 2012 +0100

    depcomp tests: avoid redundant runs for non-libtool test
    
    When running the dependency tests without libtool, it's
    not meaningful to run the tests three-fold, the libtool
    configure options are simply ignored anyway.
    
    * tests/depcomp.sh: Only run the tests three-fold when
    libtool is in use.

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

Summary of changes:
 tests/depcomp.sh |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index 708314f..9d8060d 100755
--- a/tests/depcomp.sh
+++ b/tests/depcomp.sh
@@ -286,23 +286,28 @@ test -f build-aux/depcomp \
 
 case $depmode in
   auto)
-    plan_ 84
-    do_all_tests ()
-    {
-      do_test default
-      do_test noshared --disable-shared
-      do_test nostatic --disable-static
-    }
+    if test $depcomp_with_libtool = no; then
+      plan_ 28
+      do_all_tests () { do_test; }
+    else
+      plan_ 84
+      do_all_tests ()
+      {
+        do_test default
+        do_test noshared --disable-shared
+        do_test nostatic --disable-static
+      }
+    fi
     displayed_depmode='..*' # At least one character long.
     cfg_deptrack=--enable-dependency-tracking ;;
   disabled)
     plan_ 28
-    do_all_tests() { do_test; }
+    do_all_tests () { do_test; }
     displayed_depmode=none
     cfg_deptrack=--disable-dependency-tracking ;;
   *)
     plan_ 28
-    do_all_tests() { do_test; }
+    do_all_tests () { do_test; }
     displayed_depmode="(cached) $depmode"
     cfg_deptrack="$cachevar=$depmode"
     # Sanity check: ensure the cache variable we force is truly


hooks/post-receive
-- 
GNU Automake