diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-11 22:49:13 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-11 22:49:13 +0200 |
| commit | 063cd850f2b998bb8a72714e2b435bd403a86391 (patch) | |
| tree | adcfcc3a6d96d0bd4558ba1beaca003a1c66b72d /t/lib-httpd | |
| parent | Merge branch 'jc/clone-object-format-from-void' (diff) | |
| parent | t/lib-httpd: pass PERL_PATH to CGI scripts (diff) | |
| download | git-063cd850f2b998bb8a72714e2b435bd403a86391.tar.xz git-063cd850f2b998bb8a72714e2b435bd403a86391.zip | |
Merge branch 'jk/use-perl-path-consistently'
Tests had a few places where we ignored PERL_PATH and blindly used
/usr/bin/perl, which have been corrected.
* jk/use-perl-path-consistently:
t/lib-httpd: pass PERL_PATH to CGI scripts
Diffstat (limited to 't/lib-httpd')
| -rw-r--r-- | t/lib-httpd/apache.conf | 2 | ||||
| -rw-r--r-- | t/lib-httpd/apply-one-time-perl.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index f43a25c1f1..9e6892970d 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -101,6 +101,8 @@ PassEnv LC_ALL Alias /dumb/ www/ Alias /auth/dumb/ www/auth/dumb/ +SetEnv PERL_PATH ${PERL_PATH} + <LocationMatch /smart/> SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_HTTP_EXPORT_ALL diff --git a/t/lib-httpd/apply-one-time-perl.sh b/t/lib-httpd/apply-one-time-perl.sh index 09a0abdff7..d7f9fed6ae 100644 --- a/t/lib-httpd/apply-one-time-perl.sh +++ b/t/lib-httpd/apply-one-time-perl.sh @@ -13,7 +13,7 @@ then export LC_ALL "$GIT_EXEC_PATH/git-http-backend" >out - perl -pe "$(cat one-time-perl)" out >out_modified + "$PERL_PATH" -pe "$(cat one-time-perl)" out >out_modified if cmp -s out out_modified then |