Browse Source

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
maint
Junio C Hamano 13 years ago
parent
commit
dc813f664d
  1. 2
      git-relink.perl
  2. 2
      git-svn.perl
  3. 2
      t/gitweb-lib.sh

2
git-relink.perl

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#!/usr/bin/env perl
#!/usr/bin/perl
# Copyright 2005, Ryan Anderson <ryan@michonline.com>
# Distribution permitted under the GPL v2, as distributed
# by the Free Software Foundation.

2
git-svn.perl

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#!/usr/bin/env perl
#!/usr/bin/perl
# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
# License: GPL v2 or later
use 5.008;

2
t/gitweb-lib.sh

@ -69,7 +69,7 @@ gitweb_run () { @@ -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";

Loading…
Cancel
Save