Skip to content

Commit 063cd85

Browse files
committed
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
2 parents 96f4113 + c191715 commit 063cd85

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

t/lib-httpd/apache.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ PassEnv LC_ALL
101101
Alias /dumb/ www/
102102
Alias /auth/dumb/ www/auth/dumb/
103103

104+
SetEnv PERL_PATH ${PERL_PATH}
105+
104106
<LocationMatch /smart/>
105107
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
106108
SetEnv GIT_HTTP_EXPORT_ALL

t/lib-httpd/apply-one-time-perl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ then
1313
export LC_ALL
1414

1515
"$GIT_EXEC_PATH/git-http-backend" >out
16-
perl -pe "$(cat one-time-perl)" out >out_modified
16+
"$PERL_PATH" -pe "$(cat one-time-perl)" out >out_modified
1717

1818
if cmp -s out out_modified
1919
then

0 commit comments

Comments
 (0)