[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 1c168d38aad21ee211312ae66fd159533de2a6e8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 18:08:13 2010 +0000

    2010-10-28  Søren Gjesse  <sgjesse at chromium.org>
    
            Reviewed by Tony Chang.
    
            Added support for the DumpRenderTree flags --multiple-loads and --js-flags to the Python test runner.
            https://bugs.webkit.org/show_bug.cgi?id=48236
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70789 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index aee2a58..e8c8c57 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Søren Gjesse  <sgjesse at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Added support for the DumpRenderTree flags --multiple-loads and --js-flags to the Python test runner.
+        https://bugs.webkit.org/show_bug.cgi?id=48236
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-10-28  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 42ea11d..f93f9a8 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -385,6 +385,12 @@ class ChromiumDriver(base.Driver):
         if self._port.get_option('gp_fault_error_box'):
             driver_args.append('--gp-fault-error-box')
 
+        if self._options.js_flags is not None:
+            driver_args.append('--js-flags="' + self._options.js_flags + '"')
+
+        if self._options.multiple_loads is not None and self._options.multiple_loads > 0:
+            driver_args.append('--multiple-loads=' + str(self._options.multiple_loads))
+
         if self._port.get_option('accelerated_compositing'):
             driver_args.append('--enable-accelerated-compositing')
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 6fb6f9a..39d342b 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -1513,6 +1513,10 @@ def parse_args(args=None):
             default=False, help="create a dialog on DumpRenderTree startup"),
         optparse.make_option("--gp-fault-error-box", action="store_true",
             default=False, help="enable Windows GP fault error box"),
+        optparse.make_option("--multiple-loads",
+            type="int", help="turn on multiple loads of each test"),
+        optparse.make_option("--js-flags",
+            type="string", help="JavaScript flags to pass to tests"),
         optparse.make_option("--nocheck-sys-deps", action="store_true",
             default=False,
             help="Don't check the system dependencies (themes)"),

-- 
WebKit Debian packaging