mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
46d98476cf
At present, running the t3300-*.sh test on cygwin looks like:
$ cd t
$ ./t3300-funny-names.sh
ok 1 - setup
# passed all 1 test(s)
1..1 # SKIP Your filesystem does not allow tabs in filenames
$
Unfortunately, this is not valid TAP output, which prove notes
as follows:
$ prove --exec sh t3300-funny-names.sh
t3300-funny-names.sh .. All 1 subtests passed
Test Summary Report
-------------------
t3300-funny-names.sh (Wstat: 0 Tests: 1 Failed: 0)
Parse errors: No plan found in TAP output
Files=1, Tests=1, 2 wallclock secs ( 0.05 usr 0.00 sys + \
0.90 cusr 0.49 csys = 1.43 CPU)
Result: FAIL
$
This is due to the 'trailing_plan' having a 'skip_directive'
attached to it. This is not allowed by the TAP grammar, which
only allows a 'leading_plan' to be followed by an optional
'skip_directive'. (see perldoc TAP::Parser::Grammar).
A trailing_plan is one that appears in the TAP output after one or
more test status lines (that start 'not '? 'ok ' ...), whereas a
leading_plan must appear before all test status lines (if any).
In practice, this means that the test script cannot contain a use
of the 'skip all' facility:
skip_all='Some reason to skip *all* tests in this file'
test_done
after having already executed one or more tests with (for example)
'test_expect_success'. Unfortunately, this is exactly what this
test script is doing. The first 'setup' test is actually used to
determine if the test prerequisite is satisfied by the filesystem
(ie does it allow tabs in filenames?).
In order to fix the parse errors, place the code to determine the
test prerequisite at the top level of the script, prior to the
first test, rather than as a parameter to test_expect_success.
This allows us to correctly use 'skip_all', thus:
$ ./t3300-funny-names.sh
# passed all 0 test(s)
1..0 # SKIP Your filesystem does not allow tabs in filenames
$
$ prove --exec sh t3300-funny-names.sh
t3300-funny-names.sh .. skipped: Your filesystem does not \
allow tabs in filenames
Files=1, Tests=0, 2 wallclock secs ( 0.02 usr 0.03 sys + \
0.84 cusr 0.41 csys = 1.29 CPU)
Result: NOTESTS
$
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
216 lines
5.3 KiB
Bash
Executable file
216 lines
5.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Pathnames with funny characters.
|
|
|
|
This test tries pathnames with funny characters in the working
|
|
tree, index, and tree objects.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
HT=' '
|
|
|
|
echo 2>/dev/null > "Name with an${HT}HT"
|
|
if ! test -f "Name with an${HT}HT"
|
|
then
|
|
# since FAT/NTFS does not allow tabs in filenames, skip this test
|
|
skip_all='Your filesystem does not allow tabs in filenames'
|
|
test_done
|
|
fi
|
|
|
|
p0='no-funny'
|
|
p1='tabs ," (dq) and spaces'
|
|
p2='just space'
|
|
|
|
test_expect_success 'setup' '
|
|
cat >"$p0" <<-\EOF &&
|
|
1. A quick brown fox jumps over the lazy cat, oops dog.
|
|
2. A quick brown fox jumps over the lazy cat, oops dog.
|
|
3. A quick brown fox jumps over the lazy cat, oops dog.
|
|
EOF
|
|
|
|
{ cat "$p0" >"$p1" || :; } &&
|
|
{ echo "Foo Bar Baz" >"$p2" || :; }
|
|
'
|
|
|
|
test_expect_success 'setup: populate index and tree' '
|
|
git update-index --add "$p0" "$p2" &&
|
|
t0=$(git write-tree)
|
|
'
|
|
|
|
test_expect_success 'ls-files prints space in filename verbatim' '
|
|
printf "%s\n" "just space" no-funny >expected &&
|
|
git ls-files >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'setup: add funny filename' '
|
|
git update-index --add "$p1" &&
|
|
t1=$(git write-tree)
|
|
'
|
|
|
|
test_expect_success 'ls-files quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
just space
|
|
no-funny
|
|
"tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git ls-files >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'ls-files -z does not quote funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
just space
|
|
no-funny
|
|
tabs ," (dq) and spaces
|
|
EOF
|
|
git ls-files -z >ls-files.z &&
|
|
"$PERL_PATH" -pe "y/\000/\012/" <ls-files.z >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'ls-tree quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
just space
|
|
no-funny
|
|
"tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git ls-tree -r $t1 >ls-tree &&
|
|
sed -e "s/^[^ ]* //" <ls-tree >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diff-index --name-status quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
A "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index --name-status $t0 >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diff-tree --name-status quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
A "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-tree --name-status $t0 $t1 >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diff-index -z does not quote funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
A
|
|
tabs ," (dq) and spaces
|
|
EOF
|
|
git diff-index -z --name-status $t0 >diff-index.z &&
|
|
"$PERL_PATH" -pe "y/\000/\012/" <diff-index.z >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diff-tree -z does not quote funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
A
|
|
tabs ," (dq) and spaces
|
|
EOF
|
|
git diff-tree -z --name-status $t0 $t1 >diff-tree.z &&
|
|
"$PERL_PATH" -pe y/\\000/\\012/ <diff-tree.z >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diff-tree --find-copies-harder quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
CNUM no-funny "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-tree -C --find-copies-harder --name-status $t0 $t1 >out &&
|
|
sed -e "s/^C[0-9]*/CNUM/" <out >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'setup: remove unfunny index entry' '
|
|
git update-index --force-remove "$p0"
|
|
'
|
|
|
|
test_expect_success 'diff-tree -M quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
RNUM no-funny "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index -M --name-status $t0 >out &&
|
|
sed -e "s/^R[0-9]*/RNUM/" <out >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diff-index -M -p quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
|
|
similarity index NUM%
|
|
rename from no-funny
|
|
rename to "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index -M -p $t0 >diff &&
|
|
sed -e "s/index [0-9]*%/index NUM%/" <diff >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'setup: mode change' '
|
|
chmod +x "$p1"
|
|
'
|
|
|
|
test_expect_success 'diff-index -M -p with mode change quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
|
|
old mode 100644
|
|
new mode 100755
|
|
similarity index NUM%
|
|
rename from no-funny
|
|
rename to "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index -M -p $t0 >diff &&
|
|
sed -e "s/index [0-9]*%/index NUM%/" <diff >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'diffstat for rename quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
"tabs\t,\" (dq) and spaces"
|
|
1 file changed, 0 insertions(+), 0 deletions(-)
|
|
EOF
|
|
git diff-index -M -p $t0 >diff &&
|
|
git apply --stat <diff >diffstat &&
|
|
sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
|
|
test_i18ncmp expected current
|
|
'
|
|
|
|
test_expect_success 'numstat for rename quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
0 0 "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index -M -p $t0 >diff &&
|
|
git apply --numstat <diff >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'numstat without -M quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
0 3 no-funny
|
|
3 0 "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index -p $t0 >diff &&
|
|
git apply --numstat <diff >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_expect_success 'numstat for non-git rename diff quotes funny filename' '
|
|
cat >expected <<-\EOF &&
|
|
0 3 no-funny
|
|
3 0 "tabs\t,\" (dq) and spaces"
|
|
EOF
|
|
git diff-index -p $t0 >git-diff &&
|
|
sed -ne "/^[-+@]/p" <git-diff >diff &&
|
|
git apply --numstat <diff >current &&
|
|
test_cmp expected current
|
|
'
|
|
|
|
test_done
|