summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2012-03-08 08:54:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-08 19:38:09 (GMT)
commit1cbc32403b20f064ec7c295c6603f6fd16662bce (patch)
treeb9afcc5efa3280b3ed310e95532ab774e27282ba
parent56a33c8f1bb5cef11ddf046f7b570f527ea77d37 (diff)
downloadgit-1cbc32403b20f064ec7c295c6603f6fd16662bce.zip
git-1cbc32403b20f064ec7c295c6603f6fd16662bce.tar.gz
git-1cbc32403b20f064ec7c295c6603f6fd16662bce.tar.bz2
perf: load test-lib-functions from the correct directory
Loading it in the subshells still referred to $TEST_DIRECTORY/.., which was only correct in preliminary versions of perf-lib.sh Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/perf/p0000-perf-lib-sanity.sh5
-rw-r--r--t/perf/perf-lib.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/t/perf/p0000-perf-lib-sanity.sh b/t/perf/p0000-perf-lib-sanity.sh
index 2ca4aac..f8dd536 100755
--- a/t/perf/p0000-perf-lib-sanity.sh
+++ b/t/perf/p0000-perf-lib-sanity.sh
@@ -38,4 +38,9 @@ test_expect_success 'test_export works with weird vars' '
test "$bar" = "weird # variable"
'
+test_perf 'test-lib-functions correctly loaded in subshells' '
+ : >a &&
+ test_path_is_file a
+'
+
test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 2a5e1f3..bcc0131 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -119,7 +119,7 @@ test_run_perf_ () {
test_export_="test_cleanup"
export test_cleanup test_export_
/usr/bin/time -f "%E %U %S" -o test_time.$i "$SHELL" -c '
-. '"$TEST_DIRECTORY"/../test-lib-functions.sh'
+. '"$TEST_DIRECTORY"/test-lib-functions.sh'
test_export () {
[ $# != 0 ] || return 0
test_export_="$test_export_\\|$1"