Junio C Hamano <gitster@xxxxxxxxx> writes: > Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > >> benoit.person@xxxxxxxxxx writes: >> >>> diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh >>> index 53a8dd0..dbebe49 100644 >>> --- a/wrap-for-bin.sh >>> +++ b/wrap-for-bin.sh >>> @@ -14,7 +14,7 @@ else >>> GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt' >>> export GIT_TEMPLATE_DIR >>> fi >>> -GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib' >>> +GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib:'"$GITPERLLIB" >> >> Then you need to do something like this to prevent broken $GITPERLLIB in >> user's configuration from interfering with the testsuite: >> >> --- a/t/test-lib.sh >> +++ b/t/test-lib.sh >> @@ -92,6 +92,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' >> print join("\n", @vars); >> ') >> unset XDG_CONFIG_HOME >> +unset GITPERLLIB >> GIT_AUTHOR_EMAIL=author@xxxxxxxxxxx >> GIT_AUTHOR_NAME='A U Thor' >> GIT_COMMITTER_EMAIL=committer@xxxxxxxxxxx > > Yes, that is a good point. > > It introduces a chicken-and-egg circularity for git-mw tests to use > the common test infrastructure by dot-sourcing this file, though, > no? I don't get it. It Git Mediawiki's tests, the tests scripts source test-lib.sh, that unsets GITPERLLIB. Then, it calls the mw-to-git/bin-wrapper/git that sets it properly, and calls the toplevel's bin-wrapper. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html