diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:28 -0700 |
| commit | 0ff4bdba32f2f372af8a738ff4e7beefc3c4bfe0 (patch) | |
| tree | c6bfe3a8244dda2eaa0e20667192597750f6d3a2 | |
| parent | Merge branch 'bc/fortran-userdiff' (diff) | |
| parent | t/gitweb-lib.sh: Use tabs for indent consistently (diff) | |
| download | tgif-0ff4bdba32f2f372af8a738ff4e7beefc3c4bfe0.tar.xz | |
Merge branch 'jn/gitweb-test-lib'
* jn/gitweb-test-lib:
t/gitweb-lib.sh: Use tabs for indent consistently
t/gitweb-lib.sh: Use GIT_BUILD_DIR
| -rw-r--r-- | t/gitweb-lib.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index 81ef2a0969..8c490c8707 100644 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -19,9 +19,9 @@ our \$site_name = '[localhost]'; our \$site_header = ''; our \$site_footer = ''; our \$home_text = 'indextext.html'; -our @stylesheets = ('file:///$TEST_DIRECTORY/../gitweb/static/gitweb.css'); -our \$logo = 'file:///$TEST_DIRECTORY/../gitweb/static/git-logo.png'; -our \$favicon = 'file:///$TEST_DIRECTORY/../gitweb/static/git-favicon.png'; +our @stylesheets = ('file:///$GIT_BUILD_DIR/gitweb/static/gitweb.css'); +our \$logo = 'file:///$GIT_BUILD_DIR/gitweb/static/git-logo.png'; +our \$favicon = 'file:///$GIT_BUILD_DIR/gitweb/static/git-favicon.png'; our \$projects_list = ''; our \$export_ok = ''; our \$strict_export = ''; @@ -38,7 +38,7 @@ gitweb_run () { GATEWAY_INTERFACE='CGI/1.1' HTTP_ACCEPT='*/*' REQUEST_METHOD='GET' - SCRIPT_NAME="$TEST_DIRECTORY/../gitweb/gitweb.perl" + SCRIPT_NAME="$GIT_BUILD_DIR/gitweb/gitweb.perl" QUERY_STRING=""$1"" PATH_INFO=""$2"" export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD \ @@ -81,8 +81,8 @@ if ! test_have_prereq PERL; then fi perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { - skip_all='skipping gitweb tests, perl version is too old' - test_done + skip_all='skipping gitweb tests, perl version is too old' + test_done } gitweb_init |