diff options
| -rwxr-xr-x | tests/depcomp.sh | 7 | ||||
| -rwxr-xr-x | tests/gen-testsuite-part | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/depcomp.sh b/tests/depcomp.sh index 7fa07ab81..d204058c9 100755 --- a/tests/depcomp.sh +++ b/tests/depcomp.sh @@ -67,8 +67,7 @@ # ------------------------------------------------------------------------- -am_create_testdir=empty -. ./defs || Exit 1 +# This expects ./defs has already been included has already been included.. ocwd=`pwd` || fatal_ "cannot get current working directory" longpath=this-is/a-path/which-has/quite-a/definitely/truly/long_long_name @@ -287,14 +286,14 @@ test -f build-aux/depcomp \ # only in this later case. if test $depmode,$depcomp_with_libtool = auto,yes; then - do_all_tests () { do_test; } -else do_all_tests () { do_test default do_test noshared --disable-shared do_test nostatic --disable-static } +else + do_all_tests () { do_test; } fi case $depmode in diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part index 70132092f..143cef083 100755 --- a/tests/gen-testsuite-part +++ b/tests/gen-testsuite-part @@ -341,7 +341,7 @@ foreach my $lt (TRUE, FALSE) { foreach my $m (keys %depmodes) { - my $planned = ($lt && $m eq "auto") ? 72 : 28; + my $planned = ($lt && $m eq "auto") ? 84 : 28; my @required = ( @{$depmodes{$m}}, @@ -349,6 +349,7 @@ foreach my $lt (TRUE, FALSE) ); my @vars_init = ( + "am_create_testdir=empty", "depmode=$m", "depcomp_with_libtool=" . ($lt ? "yes" : "no"), ); @@ -362,9 +363,9 @@ foreach my $lt (TRUE, FALSE) #! /bin/sh # Automatically generated test. DO NOT EDIT BY HAND! @vars_init - plan_ $planned required="@required" - . ./defs-static || exit '99' + . ./defs || Exit 1 + plan_ $planned . "\$testsrcdir/depcomp.sh"; exit "\$?" EOF }, |