undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/use-perl-path-consistently'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2023-04-11 13:49:13 -07:00
commit 063cd850f2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib-httpd/apache.conf
View File

@ -101,6 +101,8 @@ PassEnv LC_ALL
Alias /dumb/ www/ Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/ Alias /auth/dumb/ www/auth/dumb/
SetEnv PERL_PATH ${PERL_PATH}
<LocationMatch /smart/> <LocationMatch /smart/>
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
SetEnv GIT_HTTP_EXPORT_ALL SetEnv GIT_HTTP_EXPORT_ALL

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

@ -13,7 +13,7 @@ then
export LC_ALL export LC_ALL
"$GIT_EXEC_PATH/git-http-backend" >out "$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 if cmp -s out out_modified
then then