diff options
| author |  Jeff King <peff@peff.net> | 2016-11-02 14:18:25 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-11-02 19:36:29 -0700 |
| commit | 30030a36b6428e5e4b259b88bfac615ff253fd9f (patch) | |
| tree | 073c67d6cde14f92cdcf4482f690df79d4597437 | |
| parent | t0021: use write_script to create rot13 shell script (diff) | |
| download | tgif-30030a36b6428e5e4b259b88bfac615ff253fd9f.tar.xz | |
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>
| -rwxr-xr-x | t/t0021-conversion.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index dfde225491..c1ad20c618 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -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 ) |