Re: [PATCH v4 17/21] tests: add t/helper/ to the PATH with --with-dashes

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 23, 2019, 23:33 UTC
Message-ID: <xmqq1s5354gu.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <966c412f03013902826ffd188ee9af973be60833.1548254412.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 9 quoted lines

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> We really need to be able to find the test helpers... Really. This
> change was forgotten when we moved the test helpers into t/helper/
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  t/test-lib.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

It is unfortunate that --with-dashes is needed for valgrind and GIT_TEST_INSTALLED. Otherwise I do not see why we care about keeping the option working.

Does any or your test matrix entry actually use --with-dashes and rely on it working, or is it just the stuff that implicitly depend on it?

Thanks.

Show 14 quoted lines

>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 9c0ca5effb..c790e98fd2 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -1227,7 +1227,7 @@ else # normal case, use ../bin-wrappers only unless $with_dashes:
>  	GIT_EXEC_PATH=$GIT_BUILD_DIR
>  	if test -n "$with_dashes"
>  	then
> -		PATH="$GIT_BUILD_DIR:$PATH"
> +		PATH="$GIT_BUILD_DIR:$GIT_BUILD_DIR/t/helper:$PATH"
>  	fi
>  fi
>  GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt