diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKitTools/Scripts/run-webkit-httpd | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKitTools/Scripts/run-webkit-httpd')
| -rwxr-xr-x | WebKitTools/Scripts/run-webkit-httpd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebKitTools/Scripts/run-webkit-httpd b/WebKitTools/Scripts/run-webkit-httpd index a64eef6..62eae14 100755 --- a/WebKitTools/Scripts/run-webkit-httpd +++ b/WebKitTools/Scripts/run-webkit-httpd @@ -83,6 +83,7 @@ if (-f "/tmp/WebKit/httpd.pid") { } my $testDirectory = getcwd() . "/LayoutTests"; +my $jsTestResourcesDirectory = $testDirectory . "/fast/js/resources"; my $httpdPath = "/usr/sbin/httpd"; $httpdPath = "/usr/sbin/apache2" if isDebianBased(); my $httpdConfig = "$testDirectory/http/conf/httpd.conf"; @@ -106,6 +107,8 @@ print "Press Ctrl+C to stop it.\n\n"; my @args = ( "-f", "$httpdConfig", "-C", "DocumentRoot \"$documentRoot\"", + # Setup a link to where the js test templates are stored, use -c so that mod_alias will already be laoded. + "-c", "Alias /js-test-resources \"$jsTestResourcesDirectory\"", "-C", "Listen $listen", "-c", "TypesConfig \"$typesConfig\"", "-c", "CustomLog |/usr/bin/tee common", |