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>

diff --git a/t/perf/p0000-perf-lib-sanity.sh b/t/perf/p0000-perf-lib-sanity.sh
index 2ca4aaccb8a0a64513d1ab711895c8769ca2761e..f8dd53670950089c6e982110b42dd79115b54607 100755 (executable)
--- 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 2a5e1f354d6f5d98d7dc0db74395f399df03b15b..bcc0131646aa1b36e13fc47817989e3985aec1c2 100644 (file)
--- 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"