Browse Source

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
main
Junio C Hamano 2 years ago
parent
commit
063cd850f2
  1. 2
      t/lib-httpd/apache.conf
  2. 2
      t/lib-httpd/apply-one-time-perl.sh

2
t/lib-httpd/apache.conf

@ -101,6 +101,8 @@ PassEnv LC_ALL @@ -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

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

@ -13,7 +13,7 @@ then @@ -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

Loading…
Cancel
Save