diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2012-03-08 09:54:54 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-03-08 11:38:09 -0800 |
| commit | 1cbc32403b20f064ec7c295c6603f6fd16662bce (patch) | |
| tree | b9afcc5efa3280b3ed310e95532ab774e27282ba /t/perf | |
| parent | Git 1.7.10-rc0 (diff) | |
| download | tgif-1cbc32403b20f064ec7c295c6603f6fd16662bce.tar.xz | |
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>
Diffstat (limited to 't/perf')
| -rwxr-xr-x | t/perf/p0000-perf-lib-sanity.sh | 5 | ||||
| -rw-r--r-- | t/perf/perf-lib.sh | 2 |
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 2ca4aaccb8..f8dd536709 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 2a5e1f354d..bcc0131646 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" |