Merge branch 'nd/strbuf-inline-styles'

diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index ae2dc4604f708d320d88d4f99ca9d575d88b6124..d5dab5a94f1d881b8b103f6290ba91e4ec596ec6 100644 (file)
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+# Initialization and helpers for Gitweb tests, which source this
+# shell library instead of test-lib.sh.
 #
 # Copyright (c) 2007 Jakub Narebski
 #
@@ -36,7 +37,7 @@ EOF
 
        # You can set the GITWEB_TEST_INSTALLED environment variable to
        # the gitwebdir (the directory where gitweb is installed / deployed to)
-       # of an existing gitweb instalation to test that installation,
+       # of an existing gitweb installation to test that installation,
        # or simply to pathname of installed gitweb script.
        if test -n "$GITWEB_TEST_INSTALLED" ; then
                if test -d $GITWEB_TEST_INSTALLED; then
@@ -69,7 +70,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_PATH" -- "$SCRIPT_NAME" \
+       perl -- "$SCRIPT_NAME" \
                >gitweb.output 2>gitweb.log &&
        perl -w -e '
                open O, ">gitweb.headers";