aboutsummaryrefslogtreecommitdiff
path: root/t/t9700
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-06-24 17:44:46 +0000
committerJunio C Hamano <gitster@pobox.com>2010-06-25 10:06:30 -0700
commitd998bd4ab6714051ad122f89489ddbca2bb3367b (patch)
treea301f422921c2de14bed1b0e1062d3da5d87bf19 /t/t9700
parent5099b99d25f134c558edc356ad20209da679dd3b (diff)
downloadgit-d998bd4ab6714051ad122f89489ddbca2bb3367b.tar.gz
git-d998bd4ab6714051ad122f89489ddbca2bb3367b.tar.xz
test-lib: Make the test_external_* functions TAP-aware
Before TAP we just ran the Perl test and assumed that it failed if nothing was printed on STDERR. Continue doing that, but introduce a `test_external_has_tap' variable which tests can set to indicate that they're outputting TAP. If it's set we won't output a test plan, but trust the external test to do so. That way we can make external tests work with a TAP harness, but still maintain compatibility with test-lib's own way of tracking tests through the test-results directory. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9700')
-rwxr-xr-xt/t9700/test.pl11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t9700/test.pl b/t/t9700/test.pl
index 666722d9b..e5d4b03fa 100755
--- a/t/t9700/test.pl
+++ b/t/t9700/test.pl
@@ -7,6 +7,13 @@ use strict;
use Test::More qw(no_plan);
+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;
+}
+
use Cwd;
use File::Basename;
@@ -105,3 +112,7 @@ my $last_commit = $r2->command_oneline(qw(rev-parse --verify HEAD));
like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash');
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};
+
+exit($Test::Builder::Test->{Is_Passing} ? 0 : 1);