diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:03 -0800 |
| commit | ed1b87ef910fe38dfb9cf044f5c946adfab0c5e3 (patch) | |
| tree | da7ff67fe9f1e6897d9ec701aaadc2eb99a57f61 /t | |
| parent | 5be1f00a9a701532232f57958efab4be8c959a29 (diff) | |
| parent | 7a7bfc7adceec0be66aec3a4999be2f9b33ccc24 (diff) | |
| download | git-ed1b87ef910fe38dfb9cf044f5c946adfab0c5e3.tar.gz | |
Merge branch 'ab/simplify-perl-makefile'
The build procedure for perl/ part has been greatly simplified by
weaning ourselves off of MakeMaker.
* ab/simplify-perl-makefile:
perl: treat PERLLIB_EXTRA as an extra path again
perl: avoid *.pmc and fix Error.pm further
Makefile: replace perl/Makefile.PL with simple make rules
Diffstat (limited to 't')
| -rwxr-xr-x | t/perf/aggregate.perl | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl index 5c439f6bc2..3a0917fa61 100755 --- a/t/perf/aggregate.perl +++ b/t/perf/aggregate.perl @@ -1,6 +1,6 @@ #!/usr/bin/perl -use lib '../../perl/blib/lib'; +use lib '../../perl/build/lib'; use strict; use warnings; use JSON; diff --git a/t/test-lib.sh b/t/test-lib.sh index 9a0a21f49a..9af19055b3 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -939,7 +939,7 @@ then fi fi -GITPERLLIB="$GIT_BUILD_DIR"/perl/blib/lib:"$GIT_BUILD_DIR"/perl/blib/arch/auto/Git +GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib export GITPERLLIB test -d "$GIT_BUILD_DIR"/templates/blt || { error "You haven't built things yet, have you?" |