diff mbox series

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

Message ID 966c412f03013902826ffd188ee9af973be60833.1548254412.git.gitgitgadget@gmail.com (mailing list archive)
State New, archived
Headers show
Series Offer to run CI/PR builds in Azure Pipelines | expand

Commit Message

Derrick Stolee via GitGitGadget Jan. 23, 2019, 2:40 p.m. UTC
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(-)

Comments

Junio C Hamano Jan. 23, 2019, 11:33 p.m. UTC | #1
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> 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.

>
> 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
Johannes Schindelin Jan. 27, 2019, 6:40 p.m. UTC | #2
Hi Junio,

On Wed, 23 Jan 2019, Junio C Hamano wrote:

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
> 
> > 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?

This here test matrix does not rely on it. But I do hope to get the
BusyBox support (where we ship a subset of Git for Windows that is
intended to be used by 3rd-party applications only, called "MinGit", with
BusyBox instead of the MSYS2 Bash and all of those shell utilities
required by Git's scripts) closer to production. And to test *that*, I
*need* GIT_TEST_INSTALLED to work properly.

Ciao,
Dscho

> Thanks.
> 
> >
> > 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
>
diff mbox series

Patch

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