From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 Aug 2009 17:01:47 +0100
Subject: Merge in WebKit r47029.

---
 WebKitTools/Scripts/run-webkit-httpd | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'WebKitTools/Scripts/run-webkit-httpd')

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",
-- 
cgit v1.1