Changeset 53015 in webkit

Timestamp:

Jan 8, 2010 3:22:57 PM (14 years ago)

Author:

Csaba Osztrogonác

Message:

Only run http and websocket tests as last if no argument is given to be able to explicitly control the test order.

Patch by Andras Becsi <​abecsi@inf.u-szeged.hu> on 2010-01-08
Reviewed by Alexey Proskuryakov.

To be able to run multiple instances of run-webkit-tests besides each other on the same machine we need to minimize
the time when Apache and WebSocketServer is locked by tests.
Because closeHTTPD() and closeWebSocketServer() is only called at the end of the testing,
we need to run http and websocket tests after all other tests.
If one however explicitly specifies the tests to run in the argument list of run-webkit-tests
we need to preserve the given order.

• Scripts/run-webkit-tests:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-08  Andras Becsi  <abecsi@inf.u-szeged.hu>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Only run http and websocket tests as last if no argument is given to be able to explicitly control the test order.
+
+        To be able to run multiple instances of run-webkit-tests besides each other on the same machine we need to minimize
+        the time when Apache and WebSocketServer is locked by tests.
+        Because closeHTTPD() and closeWebSocketServer() is only called at the end of the testing,
+        we need to run http and websocket tests after all other tests.
+        If one however explicitly specifies the tests to run in the argument list of run-webkit-tests
+        we need to preserve the given order.
+
+        * Scripts/run-webkit-tests:
+
 2010-01-08  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -2222 +2222 @@
     @testsToRun = sort pathcmp @testsToRun;
 
-    my @httpTests;
-    my @websocketTests;
-    my @otherTests;
-    foreach my $test (@testsToRun) {
-        if ($test =~ /^http\//) {
-            push(@httpTests, $test);
-        } elsif ($test =~ /^websocket\//) {
-            push(@websocketTests, $test);
-        } else {
-            push(@otherTests, $test);
-        }
-    }
-    @testsToRun = (@otherTests, @httpTests, @websocketTests);
+    # We need to minimize the time when Apache and WebSocketServer is locked by tests
+    # so run them last if no explicit order was specified in the argument list.
+    if (!scalar @ARGV) {
+        my @httpTests;
+        my @websocketTests;
+        my @otherTests;
+        foreach my $test (@testsToRun) {
+            if ($test =~ /^http\//) {
+                push(@httpTests, $test);
+            } elsif ($test =~ /^websocket\//) {
+                push(@websocketTests, $test);
+            } else {
+                push(@otherTests, $test);
+            }
+        }
+        @testsToRun = (@otherTests, @httpTests, @websocketTests);
+    }
 
     # Reverse the tests