Title: [152852] trunk/Tools
Revision
152852
Author
[email protected]
Date
2013-07-18 11:26:06 -0700 (Thu, 18 Jul 2013)

Log Message

REGRESSION (r132678): Tests that use SSL or port 8080 time out when run using old-run-webkit-tests
https://bugs.webkit.org/show_bug.cgi?id=118854
<rdar://problem/14081339>

Reviewed by David Kilzer.

Following <http://trac.webkit.org/changeset/132678> (https://bugs.webkit.org/show_bug.cgi?id=98602)
Apache no longer listens to ports 8443 (SSL) and 8080. So, tests that use these ports time out when
run using old-run-webkit-tests. We need to update old-run-webkit-tests to explicitly tell Apache to
listen on these ports so that we can run tests that use port 8443 and 8080.

* Scripts/old-run-webkit-tests:
(configureAndOpenHTTPDIfNeeded):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (152851 => 152852)


--- trunk/Tools/ChangeLog	2013-07-18 18:05:57 UTC (rev 152851)
+++ trunk/Tools/ChangeLog	2013-07-18 18:26:06 UTC (rev 152852)
@@ -1,3 +1,19 @@
+2013-07-18  Daniel Bates  <[email protected]>
+
+        REGRESSION (r132678): Tests that use SSL or port 8080 time out when run using old-run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=118854
+        <rdar://problem/14081339>
+
+        Reviewed by David Kilzer.
+
+        Following <http://trac.webkit.org/changeset/132678> (https://bugs.webkit.org/show_bug.cgi?id=98602)
+        Apache no longer listens to ports 8443 (SSL) and 8080. So, tests that use these ports time out when
+        run using old-run-webkit-tests. We need to update old-run-webkit-tests to explicitly tell Apache to
+        listen on these ports so that we can run tests that use port 8443 and 8080.
+
+        * Scripts/old-run-webkit-tests:
+        (configureAndOpenHTTPDIfNeeded):
+
 2013-07-17  Tim Horton  <[email protected]>
 
         Update blocked/missing plug-in UI

Modified: trunk/Tools/Scripts/old-run-webkit-tests (152851 => 152852)


--- trunk/Tools/Scripts/old-run-webkit-tests	2013-07-18 18:05:57 UTC (rev 152851)
+++ trunk/Tools/Scripts/old-run-webkit-tests	2013-07-18 18:26:06 UTC (rev 152852)
@@ -141,6 +141,7 @@
 # an IPv6 environment.  See https://bugs.webkit.org/show_bug.cgi?id=37104.
 my $httpdPort = 8000;
 my $httpdSSLPort = 8443;
+my $httpdAuxiliaryPort = 8080; # Port used by various tests in http/tests/security.
 my $ignoreMetrics = 0;
 my $webSocketPort = 8880;
 # wss is disabled until all platforms support pyOpenSSL.
@@ -1580,12 +1581,17 @@
 {
     return if $isHttpdOpen;
     my $absTestResultsDirectory = resolveAndMakeTestResultsDirectory();
-    my $listen = "127.0.0.1:$httpdPort";
     my @args = (
         "-c", "CustomLog \"$absTestResultsDirectory/access_log.txt\" common",
         "-c", "ErrorLog \"$absTestResultsDirectory/error_log.txt\"",
-        "-C", "Listen $listen"
     );
+    foreach ($httpdPort, $httpdAuxiliaryPort, $httpdSSLPort) {
+        # We listen to both IPv4 and IPv6 loop-back addresses, but
+        # ignore requests to 8000 from random users on network.
+        # See <https://bugs.webkit.org/show_bug.cgi?id=37104>.
+        push @args, ("-C", "Listen 127.0.0.1:$_");
+        push @args, ("-C", "Listen [::1]:$_");
+    }
 
     my @defaultArgs = getDefaultConfigForTestDirectory($testDirectory);
     @args = (@defaultArgs, @args);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to