summaryrefslogtreecommitdiff
path: root/t/perf/run
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-09-21 15:46:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-22 20:26:11 (GMT)
commitf9d65b04cd6bb30b2bc4afc752d3bdc17474196d (patch)
tree27367f0db31db1de860c253df40b78a065785c9d /t/perf/run
parent99c99ed8259bf070cd8ae7b51a94904b7cf5c161 (diff)
downloadgit-f9d65b04cd6bb30b2bc4afc752d3bdc17474196d.zip
git-f9d65b04cd6bb30b2bc4afc752d3bdc17474196d.tar.gz
git-f9d65b04cd6bb30b2bc4afc752d3bdc17474196d.tar.bz2
t/perf/run: fix bin-wrappers computation
The GIT_TEST_INSTALLED was moved from perf-lib.sh to run in df0f5021 (perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh, 2019-05-07) and that included a change to how it inspected the existence of a bin-wrappers directory. However, that included a typo that made the match of bin-wrappers never work. Specifically, the assignment was mydir_abs_wrappers="$mydir_abs_wrappers/bin-wrappers" which uses the same variable before it is initialized. By changing it to mydir_abs_wrappers="$mydir_abs/bin-wrappers" We can correctly use the bin-wrappers directory. This is critical to successfully computing performance of commands that execute subcommands. The bin-wrappers ensure that the --exec-path is set correctly. Reported-by: Victoria Dye <vdye@github.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/perf/run')
-rwxr-xr-xt/perf/run2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/perf/run b/t/perf/run
index d19dec2..55219aa 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -74,7 +74,7 @@ set_git_test_installed () {
mydir=$1
mydir_abs=$(cd $mydir && pwd)
- mydir_abs_wrappers="$mydir_abs_wrappers/bin-wrappers"
+ mydir_abs_wrappers="$mydir_abs/bin-wrappers"
if test -d "$mydir_abs_wrappers"
then
GIT_TEST_INSTALLED=$mydir_abs_wrappers