diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Tools/Scripts/webkitperl | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Tools/Scripts/webkitperl')
| -rw-r--r-- | Tools/Scripts/webkitperl/httpd.pm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tools/Scripts/webkitperl/httpd.pm b/Tools/Scripts/webkitperl/httpd.pm index b73904d..5795340 100644 --- a/Tools/Scripts/webkitperl/httpd.pm +++ b/Tools/Scripts/webkitperl/httpd.pm @@ -94,6 +94,7 @@ sub getDefaultConfigForTestDirectory my $httpdConfig = getHTTPDConfigPathForTestDirectory($testDirectory); my $documentRoot = "$testDirectory/http/tests"; my $jsTestResourcesDirectory = $testDirectory . "/fast/js/resources"; + my $mediaResourcesDirectory = $testDirectory . "/media"; my $typesConfig = "$testDirectory/http/conf/mime.types"; my $httpdLockFile = File::Spec->catfile($httpdPidDir, "httpd.lock"); my $httpdScoreBoardFile = File::Spec->catfile($httpdPidDir, "httpd.scoreboard"); @@ -103,6 +104,7 @@ sub getDefaultConfigForTestDirectory "-C", "DocumentRoot \"$documentRoot\"", # Setup a link to where the js test templates are stored, use -c so that mod_alias will already be loaded. "-c", "Alias /js-test-resources \"$jsTestResourcesDirectory\"", + "-c", "Alias /media-resources \"$mediaResourcesDirectory\"", "-c", "TypesConfig \"$typesConfig\"", "-c", "PidFile \"$httpdPidFile\"", "-c", "ScoreBoardFile \"$httpdScoreBoardFile\"", |