diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-08 00:17:31 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-08 00:17:31 +0400 |
commit | dc813f664d779330c392500a0f3b4d53893dc7ae (patch) | |
tree | ee84fc963a43dfd2e055aa311833c3625bb09a18 /t | |
parent | 6a88021e4675b69b927ce1aa9c4dddc5dc621232 (diff) | |
parent | 0754e089c1ffc6a40574eee0564ef98b3acacc26 (diff) |
Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint
When using a Perl script on a system where "perl" found on user's $PATH
could be ancient or otherwise broken, we allow builders to specify the
path to a good copy of Perl with $PERL_PATH. The gitweb test forgot to
use that Perl when running its test.
By Jeff King (1) and Zbigniew Jędrzejewski-Szmek (1)
* jk/maint-gitweb-test-use-sane-perl:
Consistently use perl from /usr/bin/ for scripts
t/gitweb-lib: use $PERL_PATH to run gitweb
Diffstat (limited to 't')
-rw-r--r-- | t/gitweb-lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index 21d11d6c2d..ae2dc4604f 100644 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -69,7 +69,7 @@ gitweb_run () { # written to web server logs, so we are not interested in that: # we are interested only in properly formatted errors/warnings rm -f gitweb.log && - perl -- "$SCRIPT_NAME" \ + "$PERL_PATH" -- "$SCRIPT_NAME" \ >gitweb.output 2>gitweb.log && perl -w -e ' open O, ">gitweb.headers"; |