summaryrefslogtreecommitdiff
path: root/t/t4007-rename-3.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-08 09:26:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-17 07:41:52 (GMT)
commitbfdbee98109c5ad2dbbc392e7eed1ae688acc039 (patch)
treecc430b09c2901ce38ac638e9e785aabb88e2e500 /t/t4007-rename-3.sh
parent053fd0c1c3da20474c4ff175c56ea4c1d6eeda11 (diff)
downloadgit-bfdbee98109c5ad2dbbc392e7eed1ae688acc039.zip
git-bfdbee98109c5ad2dbbc392e7eed1ae688acc039.tar.gz
git-bfdbee98109c5ad2dbbc392e7eed1ae688acc039.tar.bz2
tests: use $TEST_DIRECTORY to refer to the t/ directory
Many test scripts assumed that they will start in a 'trash' subdirectory that is a single level down from the t/ directory, and referred to their test vector files by asking for files like "../t9999/expect". This will break if we move the 'trash' subdirectory elsewhere. To solve this, we earlier introduced "$TEST_DIRECTORY" so that they can refer to t/ directory reliably. This finally makes all the tests use it to refer to the outside environment. With this patch, and a one-liner not included here (because it would contradict with what Dscho really wants to do): | diff --git a/t/test-lib.sh b/t/test-lib.sh | index 70ea7e0..60e69e4 100644 | --- a/t/test-lib.sh | +++ b/t/test-lib.sh | @@ -485,7 +485,7 @@ fi | . ../GIT-BUILD-OPTIONS | | # Test repository | -test="trash directory" | +test="trash directory/another level/yet another" | rm -fr "$test" || { | trap - exit | echo >&5 "FATAL: Cannot prepare test area" all the tests still pass, but we would want extra sets of eyeballs on this type of change to really make sure. [jc: with help from Stephan Beyer on http-push tests I do not run myself; credits for locating silly quoting errors go to Olivier Marin.] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4007-rename-3.sh')
-rwxr-xr-xt/t4007-rename-3.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index 104a4e1..42072d7 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -7,12 +7,12 @@ test_description='Rename interaction with pathspec.
'
. ./test-lib.sh
-. ../diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
test_expect_success \
'prepare reference tree' \
'mkdir path0 path1 &&
- cp ../../COPYING path0/COPYING &&
+ cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
git update-index --add path0/COPYING &&
tree=$(git write-tree) &&
echo $tree'