diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-16 20:49:43 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-16 20:50:04 +0100 |
| commit | ea441902e8f6e53f548e7df779d3cd71400929ec (patch) | |
| tree | 602ffab9730e5fe816f510f5e91e9561f9462e1e /tests/gen-testsuite-part | |
| parent | 86e9e0e331e5008ab5ca9db77d74c542042dcfe8 (diff) | |
| download | automake-ea441902e8f6e53f548e7df779d3cd71400929ec.tar.gz | |
depcomp tests: fix up today's botched commit
Today's commit 'v1.11-1959-g0699a84' has caused the generated
'depcomp*.tap' tests to call the 'plan_' function *before* it is
defined, and has also caused the extra checks required for better
libtool coverage to be run only when libtool is *not* in use,
rather than the other way around. Fix this mess.
Report by Peter Rosin.
* tests/gen-testsuite-part: Include './defs' in the generated
tests, rather than doing so from 'depcomp.sh'. Adjust the count
of TAP tests for 'depcomp-lt-auto.test' (it's 84, not 72).
* tests/depcomp.sh: Adjust accordingly, and fix inverted logic
about the decision of when to run extra checks for libtool.
Diffstat (limited to 'tests/gen-testsuite-part')
| -rwxr-xr-x | tests/gen-testsuite-part | 7 |
1 files changed, 4 insertions, 3 deletions
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 }, |