This is v4 of the TAP series for Git. This version fixes the failure Junio had with it (see <7v6319duky.fsf@xxxxxxxxxxxxxxxxxxxxxxxx>). It does this by reverting the removal of the test_external_* functions. Now they're made TAP aware instead with a global `test_external_has_tap' that can be set by tests who wish to output their own TAP. Thus t9700-perl-git.sh will again fail if it has any output on stderr, but since it sets `test_external_has_tap=1' we'll let it finalize its own TAP plan. Not removing the test_external_* makes the impact of this series smaller, and preserves compatibility with other topics in-flight, such as the Gettext series. This is the diff --stat from v3: t/t9700-perl-git.sh | 11 ++++-- t/test-lib.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 101 insertions(+), 7 deletions(-) Most of the additions are the restorations of the test_external_* functions, in slightly altered form. Ævar Arnfjörð Bjarmason (5): test-lib: Adjust output to be valid TAP format test-lib: Make the test_external_* functions TAP-aware test-lib: output a newline before "ok" under a TAP harness tests: Skip tests in a way that makes sense under TAP tests: Say "pass" rather than "ok" on empty lines for TAP t/README | 55 ++++++++++++++++------- t/lib-git-svn.sh | 4 +- t/lib-httpd.sh | 3 +- t/t1020-subdirectory.sh | 12 +++--- t/t1304-default-acl.sh | 9 +++- t/t1509-root-worktree.sh | 6 +- t/t2007-checkout-symlink.sh | 2 +- t/t2102-update-index-symlinks.sh | 2 +- t/t3300-funny-names.sh | 2 +- t/t3302-notes-index-expensive.sh | 2 +- t/t3600-rm.sh | 2 +- t/t3700-add.sh | 12 +++--- t/t3701-add-interactive.sh | 4 +- t/t3902-quoted.sh | 2 +- t/t4004-diff-rename-symlink.sh | 2 +- t/t4011-diff-symlink.sh | 2 +- t/t4016-diff-quote.sh | 2 +- t/t4023-diff-rename-typechange.sh | 2 +- t/t4114-apply-typechange.sh | 2 +- t/t4115-apply-symlink.sh | 2 +- t/t4122-apply-symlink-inside.sh | 2 +- t/t5302-pack-index.sh | 2 +- t/t5503-tagfollow.sh | 2 +- t/t5522-pull-symlink.sh | 2 +- t/t5540-http-push.sh | 2 +- t/t5541-http-push.sh | 2 +- t/t5550-http-fetch.sh | 2 +- t/t5551-http-fetch.sh | 2 +- t/t5561-http-backend.sh | 2 +- t/t5705-clone-2gb.sh | 2 +- t/t6035-merge-dir-to-symlink.sh | 2 +- t/t7004-tag.sh | 2 +- t/t7006-pager.sh | 2 +- t/t7800-difftool.sh | 2 +- t/t9001-send-email.sh | 4 +- t/t9100-git-svn-basic.sh | 2 +- t/t9119-git-svn-info.sh | 2 +- t/t9129-git-svn-i18n-commitencoding.sh | 2 +- t/t9143-git-svn-gc.sh | 2 +- t/t9200-git-cvsexportcommit.sh | 4 +- t/t9400-git-cvsserver-server.sh | 6 +- t/t9401-git-cvsserver-crlf.sh | 6 +- t/t9600-cvsimport.sh | 2 +- t/t9700-perl-git.sh | 7 ++- t/t9700/test.pl | 11 +++++ t/test-lib.sh | 76 +++++++++++++++++++++++-------- 46 files changed, 178 insertions(+), 103 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html