On Mon, May 06, 2019 at 09:16:11PM +0200, Ævar Arnfjörð Bjarmason wrote:
> Perhaps there's some better way to fix this, but it seems to me that
> the best solution is to just make this behavior less magical. We know
> in run_dirs_helper() that we're about to run performance tests on a
> given <revision>, so let's just set GIT_TEST_INSTALLED to an absolute
> path there, and then make getting logging target from a previously
> relative path less magical, we'll just explicitly pass down the
> relative path as a variable.
>
> This makes e.g. these cases all work:
>
> ./run . $PWD/../../ origin/master origin/next HEAD -- <tests>
>
> As well as just a plain one-off:
>
> ./run <tests>
Doing this naively would break anybody doing:
GIT_TEST_INSTALLED=some-relative-path ./p1234-foo.sh
but I doubt that actually matters in practice (notably this already does
not work with non-perf tests, as test-lib.sh does not do any
normalization).
I don't think your patch does, because it leaves the extra absolutizing
in perf-lib.sh. But then it doesn't feel like it's really simplified
anything. ;)
> diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
> index 169f92eae3..b15ee1d262 100644
> --- a/t/perf/perf-lib.sh
> +++ b/t/perf/perf-lib.sh
> @@ -32,6 +32,10 @@ TEST_NO_MALLOC_CHECK=t
> if test -z "$GIT_TEST_INSTALLED"; then
> perf_results_prefix=
> else
> + if test -n "$GIT_PERF_DIR_MYDIR_REL"
> + then
> + GIT_TEST_INSTALLED=$GIT_PERF_DIR_MYDIR_REL
> + fi
> perf_results_prefix=$(printf "%s" "${GIT_TEST_INSTALLED%/bin-wrappers}" | tr -c "[a-zA-Z0-9]" "[_*]")"."
> GIT_TEST_INSTALLED=$ABSOLUTE_GIT_TEST_INSTALLED
> fi
So we reset GIT_TEST_INSTALLED to the relative path here (ignoring
what's in it!), and then afterwards set it to the absolute path. That
still seems rather magical. :)
What if instead we:
- taught test-lib.sh to make GIT_TEST_INSTALLED absolute (since after
all it is the one who is planning to chdir and wreck the relative
path)
- let callers pass in $GIT_PERF_RESULTS_PREFIX instead of guessing at
it ourselves from the path name. Then the "run" script could quite
reasonably just pass in the tree oid it already has instead of us
trying to decode it. And nobody would care about whether
$GIT_TEST_INSTALLED has been mangled.
I thought about going this route for my original patch, but I wanted to
fix the regression (which I agree is quite serious and embarrassing) as
quickly and simply as possible.
-Peff
