Merge branch 'maint-1.7.1' into maint-1.7.2

diff --git a/t/t9700/test.pl b/t/t9700/test.pl
index e5d4b03fa44293066e49dd0c2895077475812e40..671f38db2bb78c076b281602ca5b87f10fdf4d00 100755 (executable)
--- a/t/t9700/test.pl
+++ b/t/t9700/test.pl
@@ -10,8 +10,8 @@
 BEGIN {
        # t9700-perl-git.sh kicks off our testing, so we have to go from
        # there.
-       $Test::Builder::Test->{Curr_Test} = 1;
-       $Test::Builder::Test->{No_Ending} = 1;
+       Test::More->builder->current_test(1);
+       Test::More->builder->no_ending(1);
 }
 
 use Cwd;
@@ -113,6 +113,7 @@ BEGIN
 my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.');
 isnt($last_commit, $dir_commit, 'log . does not show last commit');
 
-printf "1..%d\n", $Test::Builder::Test->{Curr_Test};
+printf "1..%d\n", Test::More->builder->current_test;
 
-exit($Test::Builder::Test->{Is_Passing} ? 0 : 1);
+my $is_passing = eval { Test::More->is_passing };
+exit($is_passing ? 0 : 1) unless $@ =~ /Can't locate object method/;