[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3acc85f5854dd464f9afc2a89842298c37da2109
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 09:35:01 2010 +0000

    2010-10-21  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
    
            Reviewed by Ojan Vafai.
    
            [NRWT] Get child process number from an environment variable
            https://bugs.webkit.org/show_bug.cgi?id=47981
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70217 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d138f3d..78e6817 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-21  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
+
+        Reviewed by Ojan Vafai.
+
+        [NRWT] Get child process number from an environment variable
+        https://bugs.webkit.org/show_bug.cgi?id=47981
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-10-20  David Kilzer  <ddkilzer at apple.com>
 
         <http://webkit.org/b/47754> New script to verify explicit source file types in Xcode project files
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 9cc7895..dc8a1f4 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -1436,7 +1436,8 @@ def _set_up_derived_options(port_obj, options):
 
     if not options.child_processes:
         # FIXME: Investigate perf/flakiness impact of using cpu_count + 1.
-        options.child_processes = str(port_obj.default_child_processes())
+        options.child_processes = os.environ.get("WEBKIT_TEST_CHILD_PROCESSES",
+                                                 str(port_obj.default_child_processes()))
 
     if not options.configuration:
         options.configuration = port_obj.default_configuration()

-- 
WebKit Debian packaging