[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ec031cb0149332c2626a47f45934f39ef527bb62
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 23:22:57 2010 +0000

    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 at 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:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 387dfda..3f83c73 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-08  Andras Becsi  <abecsi at 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 at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index f651781..39ed501 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -2221,19 +2221,23 @@ sub findTestsToRun
 
     @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);
+    # 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);
     }
-    @testsToRun = (@otherTests, @httpTests, @websocketTests);
 
     # Reverse the tests
     @testsToRun = reverse @testsToRun if $reverseTests;

-- 
WebKit Debian packaging