On Tue, Jan 29, 2019 at 03:46:07PM -0800, Jeremy Huddleston Sequoia wrote: > > > > On Jan 29, 2019, at 2:47 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > > > Jeremy Huddleston Sequoia <jeremyhu@xxxxxxxxx> writes: > > > >> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@xxxxxxxxx> > >> --- > >> t/test-lib.sh | 3 +++ > >> 1 file changed, 3 insertions(+) > > > > This obviously won't be acceptable as-is to my tree. Shouldn't this > > be something to be dealt with in config.mak.uname or something that > > is meant to define platform-specific customization? > > The issue here is that we're not locating relocatable perl modules > during testing. This is a general problem with testing > RUNTIME_PREFIX configurations, and a more general solution to this > sledgehammer would be appropriate. I don't think config.mak.uname > really makes sense since it's a general RUNTIME_PREFIX issue and not > specifically a darwin issue. But this patch is very darwin-specific ... > >> diff --git a/t/test-lib.sh b/t/test-lib.sh > >> index 0f1faa24b2..4060a53f56 100644 > >> --- a/t/test-lib.sh > >> +++ b/t/test-lib.sh > >> @@ -1017,6 +1017,9 @@ fi > >> > >> GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib > >> export GITPERLLIB > >> +PERL_VERSION=$(grep DEFAULT /usr/local/versioner/perl/versions | sed 's:^.*= *\([^ ]*\)$:\1:') > >> +PERL5LIB="$GIT_BUILD_DIR"/perl:"$(xcode-select -p)"/Library/Perl/$PERL_VERSION ... because what other platforms could possibly have 'xcode-select' installed!? Consequently: $ ./t0000-basic.sh grep: /usr/local/versioner/perl/versions: No such file or directory ./t0000-basic.sh: 1154: ./test-lib.sh: xcode-select: not found ok 1 - verify that the running shell supports "local" ok 2 - .git/objects should be empty after git init in an empty repo ok 3 - .git/objects should have 3 subdirectories ok 4 - success is reported like this not ok 5 - pretend we have a fully passing test suite <...> # failed 29 among 82 test(s) > >> +export PERL5LIB > >> test -d "$GIT_BUILD_DIR"/templates/blt || { > >> error "You haven't built things yet, have you?" > >> } >