summaryrefslogtreecommitdiff
path: root/t/t4114-apply-typechange.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-07 18:18:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-07 18:18:44 (GMT)
commit2a16315031cf478601ea150f7861d4f86b1350a2 (patch)
treea7bdc4b0d4cc28640a55a7689c0cccefecb3c642 /t/t4114-apply-typechange.sh
parentfcd91f8de20bf7969599a7a60cba73117d99f2d1 (diff)
parentc9667456d201c435af523ffb7d583efd1784232a (diff)
downloadgit-2a16315031cf478601ea150f7861d4f86b1350a2.zip
git-2a16315031cf478601ea150f7861d4f86b1350a2.tar.gz
git-2a16315031cf478601ea150f7861d4f86b1350a2.tar.bz2
Merge branch 'ab/tap'
* ab/tap: t/README: document more test helpers t/README: proposed rewording... t/README: Document the do's and don'ts of tests t/README: Add a section about skipping tests t/README: Document test_expect_code t/README: Document test_external* t/README: Document the prereq functions, and 3-arg test_* t/README: Typo: paralell -> parallel t/README: The trash is in 't/trash directory.$name' t/t9700/test.pl: don't access private object members, use public access methods t9700: Use Test::More->builder, not $Test::Builder::Test tests: Say "pass" rather than "ok" on empty lines for TAP tests: Skip tests in a way that makes sense under TAP test-lib: output a newline before "ok" under a TAP harness test-lib: Make the test_external_* functions TAP-aware test-lib: Adjust output to be valid TAP format
Diffstat (limited to 't/t4114-apply-typechange.sh')
-rwxr-xr-xt/t4114-apply-typechange.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4114-apply-typechange.sh b/t/t4114-apply-typechange.sh
index 99ec13d..164d58c 100755
--- a/t/t4114-apply-typechange.sh
+++ b/t/t4114-apply-typechange.sh
@@ -11,7 +11,7 @@ test_description='git apply should not get confused with type changes.
if ! test_have_prereq SYMLINKS
then
- say 'Symbolic links not supported, skipping tests.'
+ skip_all='Symbolic links not supported, skipping tests.'
test_done
fi