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. This change is intended to make it possible to test that process of installing gitweb (and the modules it depends on) works correctly after splitting gitweb. Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- It is an RFC because I am not sure where to put documentation, i.e. description of GITWEB_TEST_INSTALLED. Should it be put in t/README, in gitweb/README, or in gitweb/INSTALL, or in t/gitweb-lib.sh header? t/gitweb-lib.sh | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index 8c490c8..b17459c 100755 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -32,17 +32,28 @@ EOF cat >.git/description <<EOF $0 test repository 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. + if test -n "$GITWEB_TEST_INSTALLED" ; then + SCRIPT_NAME="$GITWEB_TEST_INSTALLED/gitweb.cgi" + test -f "$SCRIPT_NAME" || + error "Cannot find gitweb.cgi at $GITWEB_TEST_INSTALLED." + else # normal case, use source version of gitweb + SCRIPT_NAME="$GIT_BUILD_DIR/gitweb/gitweb.perl" + fi + export SCRIPT_NAME } gitweb_run () { GATEWAY_INTERFACE='CGI/1.1' HTTP_ACCEPT='*/*' REQUEST_METHOD='GET' - SCRIPT_NAME="$GIT_BUILD_DIR/gitweb/gitweb.perl" QUERY_STRING=""$1"" PATH_INFO=""$2"" export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD \ - SCRIPT_NAME QUERY_STRING PATH_INFO + QUERY_STRING PATH_INFO GITWEB_CONFIG=$(pwd)/gitweb_config.perl export GITWEB_CONFIG -- 1.7.2.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html