[PATCH] t/perf/run: fix bin-wrappers computation
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Sep 21, 2021, 15:46 UTC
- Message-ID
- <pull.1044.git.1632239172735.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
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>
---
t/perf/run: fix bin-wrappers computation
Found this while we were testing sparse index improvements to 'git
stash', which uses a lot of subcommands.
Thanks, -StoleePublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1044%2Fderrickstolee%2Fperf-run-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1044/derrickstolee/perf-run-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1044
t/perf/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/perf/run b/t/perf/run index d19dec258a2..55219aa4056 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 base-commit: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
-- gitgitgadget