t0021: put $TEST_ROOT in $PATH
We create a rot13.sh script in the trash directory, but need to call it by its full path when we have moved our cwd to another directory. Let's just put $TEST_ROOT in our $PATH so that the script is always found. This is a minor convenience for rot13.sh, but will be a major one when we switch rot13-filter.pl to a script in the same directory, as it means we will not have to deal with shell quoting inside the filter-process config. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cbb6707b11
commit
30030a36b6
@ -5,6 +5,7 @@ test_description='blob conversion via gitattributes'
|
||||
. ./test-lib.sh
|
||||
|
||||
TEST_ROOT="$(pwd)"
|
||||
PATH=$TEST_ROOT:$PATH
|
||||
|
||||
write_script <<\EOF "$TEST_ROOT/rot13.sh"
|
||||
tr \
|
||||
@ -64,7 +65,7 @@ test_cmp_exclude_clean () {
|
||||
# is equal to the committed content.
|
||||
test_cmp_committed_rot13 () {
|
||||
test_cmp "$1" "$2" &&
|
||||
"$TEST_ROOT/rot13.sh" <"$1" >expected &&
|
||||
rot13.sh <"$1" >expected &&
|
||||
git cat-file blob :"$2" >actual &&
|
||||
test_cmp expected actual
|
||||
}
|
||||
@ -513,7 +514,7 @@ test_expect_success PERL 'required process filter should process multiple packet
|
||||
for FILE in "$TEST_ROOT"/*.file
|
||||
do
|
||||
cp "$FILE" . &&
|
||||
"$TEST_ROOT/rot13.sh" <"$FILE" >"$FILE.rot13"
|
||||
rot13.sh <"$FILE" >"$FILE.rot13"
|
||||
done &&
|
||||
|
||||
echo "*.file filter=protocol" >.gitattributes &&
|
||||
@ -616,7 +617,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f
|
||||
|
||||
# Smudge failed
|
||||
! test_cmp smudge-write-fail.o smudge-write-fail.r &&
|
||||
"$TEST_ROOT/rot13.sh" <smudge-write-fail.o >expected &&
|
||||
rot13.sh <smudge-write-fail.o >expected &&
|
||||
git cat-file blob :smudge-write-fail.r >actual &&
|
||||
test_cmp expected actual
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user