Reviewed by Darin.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Feb 2006 06:10:25 +0000 (06:10 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Feb 2006 06:10:25 +0000 (06:10 +0000)
        - http://bugzilla.opendarwin.org/show_bug.cgi?id=7409
          Some minor fixes to http tests.

LayoutTests:

        * http/conf/httpd.conf: don't define CustomLog and ErrorLog - these are now
        passed from run-webkit-tests.
        * http/tests/favicon.ico: Added.
        * http/tests/incremental/slow-utf8-text.text: Remove an unused variable,
        * http/tests/incremental/split-hex-entities.html: Ditto.
        * http/tests/xmlhttprequest/interactive-state.cgi: Ditto.

WebKitTools:

        * Scripts/run-webkit-tests: Pass CustomLog and ErrorLog directives to httpd.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12931 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/conf/httpd.conf
LayoutTests/http/tests/favicon.ico [new file with mode: 0644]
LayoutTests/http/tests/incremental/slow-utf8-text.text
LayoutTests/http/tests/incremental/split-hex-entities.html
LayoutTests/http/tests/xmlhttprequest/interactive-state.cgi
WebKitTools/ChangeLog
WebKitTools/Scripts/run-webkit-tests

index ca52e64..40188bc 100644 (file)
@@ -1,3 +1,17 @@
+2006-02-22  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=7409
+          Some minor fixes to http tests.
+
+        * http/conf/httpd.conf: don't define CustomLog and ErrorLog - these are now 
+        passed from run-webkit-tests.
+        * http/tests/favicon.ico: Added.
+        * http/tests/incremental/slow-utf8-text.text: Remove an unused variable,
+        * http/tests/incremental/split-hex-entities.html: Ditto.
+        * http/tests/xmlhttprequest/interactive-state.cgi: Ditto.
+
 2006-02-21  Adele Peterson  <adele@apple.com>
 
         Reviewed by Hyatt.
index a2b7df0..b754047 100644 (file)
@@ -441,7 +441,8 @@ HostnameLookups Off
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "/tmp/WebKit/error_log"
+# Configured from the httpd command line for WebKit layout tests.
+#ErrorLog "/tmp/layout-test-results/error_log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -466,13 +467,14 @@ LogFormat "%{User-agent}i" agent
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog "/tmp/WebKit/access_log" common
+# Configured from the httpd command line for WebKit layout tests.
+#CustomLog "/tmp/layout-test-results/access_log" common
 
 #
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog "/private/var/log/httpd/access_log" combined
+#CustomLog "/tmp/layout-test-results/access_log" combined
 
 #
 # Optionally add a line containing the server version and virtual host
diff --git a/LayoutTests/http/tests/favicon.ico b/LayoutTests/http/tests/favicon.ico
new file mode 100644 (file)
index 0000000..0069d5d
Binary files /dev/null and b/LayoutTests/http/tests/favicon.ico differ
index a636b2e..9f653c9 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # flush the buffers after each print
-$cfh = select (STDOUT);
+select (STDOUT);
 $| = 1;
 
 print "Content-Type: text/plain\n\n";
index d92957c..faa9ef6 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # flush the buffers after each print
-$cfh = select (STDOUT);
+select (STDOUT);
 $| = 1;
 
 print "Content-Type: text/html\n\n";
index 5b4cf29..858c77c 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # flush the buffers after each print
-$cfh = select (STDOUT);
+select (STDOUT);
 $| = 1;
 
 print "Content-Type: text/html\n\n";
index 319521f..566606c 100644 (file)
@@ -1,3 +1,12 @@
+2006-02-22  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=7409
+          Some minor fixes to http tests.
+
+        * Scripts/run-webkit-tests: Pass CustomLog and ErrorLog directives to httpd.
+
 2006-02-21  Alexey Proskuryakov  <ap@nypop.com>
 
         Reviewed by Darin.
index 5d8d265..9106539 100755 (executable)
@@ -229,7 +229,9 @@ sub openHTTPDIfNeeded()
         "-f", "$httpdConfig",
         "-C", "DocumentRoot \"$documentRoot\"",
         "-C", "Listen $listen",
-        "-c", "TypesConfig \"$typesConfig\"");
+        "-c", "TypesConfig \"$typesConfig\"",
+        "-c", "CustomLog \"$testResultsDirectory/access_log.txt\" common",
+        "-c", "ErrorLog \"$testResultsDirectory/error_log.txt\"");
 
     sleep 1; # FIXME: need a better way to wait for Apache to bind to the port
     $httpdOpen = 1;