t9700: Use Test::More->builder, not $Test::Builder::Test
$Test::Builder::Test was only made into an `our' variable in 0.94 released in September 2009, older distros are more likely to have 0.92 or earlier. Use the singleton Test::More->builder constructor instead. The exit() call was also unportable to <0.94. Just output a meaningful exit code if the ->is_passing method exists. The t9700-perl-git.sh test only cares about stderr output, so this doesn't affect test results when using older Test::More modules. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jun 26, 2010 at 12:42 UTC
635155fa3d825570080d727245a76e666bbae145
1 file changed
+5
-4
t/t9700/test.pl
+5
-4
@@ -10,8 +10,8 @@ use Test::More qw(no_plan);
10
BEGIN {
11
# t9700-perl-git.sh kicks off our testing, so we have to go from
12
# there.
13
- $Test::Builder::Test->{Curr_Test} = 1;
14
- $Test::Builder::Test->{No_Ending} = 1;
13
+ Test::More->builder->{Curr_Test} = 1;
14
+ Test::More->builder->{No_Ending} = 1;
15
}
16
17
use Cwd;
@@ -113,6 +113,7 @@ like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash');
113
my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.');
114
isnt($last_commit, $dir_commit, 'log . does not show last commit');
115
116
-printf "1..%d\n", $Test::Builder::Test->{Curr_Test};
116
+printf "1..%d\n", Test::More->builder->{Curr_Test};
117
118
-exit($Test::Builder::Test->{Is_Passing} ? 0 : 1);
118
+my $is_passing = eval { Test::More->is_passing };
119
+exit($is_passing ? 0 : 1) unless $@ =~ /Can't locate object method/;