diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:55 -0700 |
commit | 7c1b228d26107d2cac9fd9549a6a1cff41c24b51 (patch) | |
tree | 519d90ef8a478aa004879617757a2b2d30fbec98 /t | |
parent | bcacc0ebdb17b55040826bf82d1bde4070119250 (diff) | |
parent | 78646987e41967bb3533fae221205d73ea9af4d1 (diff) | |
download | git-7c1b228d26107d2cac9fd9549a6a1cff41c24b51.tar.gz |
Merge branch 'jn/gitweb-plackup'
* jn/gitweb-plackup:
git-instaweb: Add support for running gitweb via 'plackup'
git-instaweb: Wait for server to start before running web browser
git-instaweb: Remove pidfile after stopping web server
git-instaweb: Configure it to work with new gitweb structure
git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
gitweb: Set default destination directory for installing gitweb in Makefile
gitweb: Move static files into seperate subdirectory
Diffstat (limited to 't')
-rw-r--r-- | t/gitweb-lib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index 5a734b1b7b..b70b891b62 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/gitweb.css'); -our \$logo = 'file:///$TEST_DIRECTORY/../gitweb/git-logo.png'; -our \$favicon = 'file:///$TEST_DIRECTORY/../gitweb/git-favicon.png'; +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 \$projects_list = ''; our \$export_ok = ''; our \$strict_export = ''; |