[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 531e7f1d4f8320f4ed5e66674364a75675c3569f
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 07:56:15 2010 +0000

    Run the http and websocket tests after all other tests.
    
    Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2010-01-07
    Reviewed by Darin Adler.
    
    * Scripts/run-webkit-tests:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1acf9ef..ed22121 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-07  Andras Becsi  <abecsi at inf.u-szeged.hu>
+
+        Reviewed by Darin Adler.
+
+        Run the http and websocket tests after all other tests.
+
+        * Scripts/run-webkit-tests:
+
 2010-01-07  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 74766f0..f651781 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -2221,6 +2221,20 @@ 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);
+        }
+    }
+    @testsToRun = (@otherTests, @httpTests, @websocketTests);
+
     # Reverse the tests
     @testsToRun = reverse @testsToRun if $reverseTests;
 

-- 
WebKit Debian packaging