From: Peter Rosin <peda@lysator.liu.se>
Date: Tue, 14 Feb 2012 01:51:55 +0000 (+0100)
Subject: depcomp tests: avoid redundant runs for non-libtool test
X-Git-Tag: ng-0.5a~9^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c430b160d34f6d27bdbf92dbde3b7fbae8b12a9;p=thirdparty%2Fautomake.git

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.
---

diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index 708314fd3..9d8060dba 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