Reviewed by Darin.

        - 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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ca52e64ebbb619ebdccd251b15a6749728a03243..40188bc1333f3b4ad14a9340a95ef38f31da1db0 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -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.

diff --git a/LayoutTests/http/conf/httpd.conf b/LayoutTests/http/conf/httpd.conf
index a2b7df08d46d84adbf8f6f10851bb7312ff51a7c..b75404789e7cabe1874244b6b5f38ef540af5792 100644 (file)
--- a/LayoutTests/http/conf/httpd.conf
+++ b/LayoutTests/http/conf/httpd.conf
@@ -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

diff --git a/LayoutTests/http/tests/incremental/slow-utf8-text.text b/LayoutTests/http/tests/incremental/slow-utf8-text.text
index a636b2e2d3f22c3f95730be31f13a55a6ace0307..9f653c9d80b7de316277ef01391636d9a2b496a2 100755 (executable)
--- a/LayoutTests/http/tests/incremental/slow-utf8-text.text
+++ b/LayoutTests/http/tests/incremental/slow-utf8-text.text
@@ -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";

diff --git a/LayoutTests/http/tests/incremental/split-hex-entities.html b/LayoutTests/http/tests/incremental/split-hex-entities.html
index d92957cfe40673d4b543df557752e3d322e52037..faa9ef6debfc561daf029f0142c70378e4f4a101 100755 (executable)
--- a/LayoutTests/http/tests/incremental/split-hex-entities.html
+++ b/LayoutTests/http/tests/incremental/split-hex-entities.html
@@ -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";

diff --git a/LayoutTests/http/tests/xmlhttprequest/interactive-state.cgi b/LayoutTests/http/tests/xmlhttprequest/interactive-state.cgi
index 5b4cf2929b29b083d06d080b24cad187891b17ac..858c77ce0f5de90a3fdb522368fd534e0584372f 100755 (executable)
--- a/LayoutTests/http/tests/xmlhttprequest/interactive-state.cgi
+++ b/LayoutTests/http/tests/xmlhttprequest/interactive-state.cgi
@@ -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";

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 319521f228dd1fa86aaaf639b0ae7134487273e6..566606c22c7d63ec5ee4da7db7b0e7833025ff3f 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -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.

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 5d8d265409a3dd97c8058904c516d3e1d892ee3d..91065398100a51a5d0694b30fedad6b0cff6dd94 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -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;