path: root/t/perf/
diff options
authorÆvar Arnfjörð Bjarmason <>2019-05-07 10:54:32 (GMT)
committerJunio C Hamano <>2019-05-08 02:00:28 (GMT)
commitdf0f5021951bd0ae5e7db0d89fd7e5c141c334be (patch)
treec8fddb9dd9ec24982e71be02f43dca2b4644436c /t/perf/
parent90e38154eeb57f05ac099c42f4b369c8dad9ad2c (diff)
git-df0f5021951bd0ae5e7db0d89fd7e5c141c334be.tar.bz2 remove GIT_TEST_INSTALLED from
Follow-up my preceding change which fixed the immediate "./run <revisions>" regression in 0baf78e7bc (" rely on for --tee handling", 2019-03-15) and entirely get rid of GIT_TEST_INSTALLED from (and aggregate.perl). As noted in that change the dance we're doing with GIT_TEST_INSTALLED isn't necessary, but there I was doing the most minimal set of changes to quickly fix a regression. But it's much simpler to never deal with the "GIT_TEST_INSTALLED" we were setting in at all. Instead the run_dirs_helper() sets the previously inferred $PERF_RESULTS_PREFIX directly. Setting this at the callsite that's already best positioned to exhaustively know about all the different cases we need to handle where PERF_RESULTS_PREFIX isn't what we want already (the empty string) makes the most sense. In one-off cases like: ./run ./ ./ We'll just do the right thing because PERF_RESULTS_PREFIX will be empty, and takes care of finding where our git is. Any refactoring of this code needs to change both the shell code and the Perl code in aggregate.perl, because when running e.g.: ./run ../../ -- <test> The "../../" path to a relative bindir needs to be munged to a filename containing the results, and critically aggregate.perl does not get passed the path to those aggregations, just "../..". Let's fix cases where aggregate.perl would print e.g. ".." in its report output for this, and "git" for "/home/avar/g/git", i.e. it would always pick the last element. Now'll always print the full path instead. This also makes the code sturdier, e.g. you can feed "../.." to "./run" and then an absolute path to the aggregate.perl script, as long as the absolute path and "../.." resolved to the same directory printing the aggregation will work. Also simplify the "[_*]" on the RHS of "tr -c", we're trimming everything to "_", so we don't need that. Signed-off-by: Ævar Arnfjörð Bjarmason <>
Diffstat (limited to 't/perf/')
1 files changed, 1 insertions, 14 deletions
diff --git a/t/perf/ b/t/perf/
index b15ee1d..9cdccba 100644
--- a/t/perf/
+++ b/t/perf/
@@ -21,25 +21,12 @@
# because it will change our working directory.
- test -n "$GIT_TEST_INSTALLED" && cd "$GIT_TEST_INSTALLED" && pwd)
. ../
-if test -z "$GIT_TEST_INSTALLED"; then
- perf_results_prefix=
- if test -n "$GIT_PERF_DIR_MYDIR_REL"
- then
- fi
- perf_results_prefix=$(printf "%s" "${GIT_TEST_INSTALLED%/bin-wrappers}" | tr -c "[a-zA-Z0-9]" "[_*]")"."
# Variables from test-lib that are normally internal to the tests; we
# need to export them for test_perf subshells
@@ -183,7 +170,7 @@ test_wrapper_ () {
base=$(basename "$0" .sh)
echo "$test_count" >>"$perf_results_dir"/$base.subtests
echo "$1" >"$perf_results_dir"/$base.$test_count.descr
- base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
+ base="$perf_results_dir"/"$PERF_RESULTS_PREFIX$(basename "$0" .sh)"."$test_count"
"$test_wrapper_func_" "$@"