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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit bf8e6b2bf84cd1b91a6d79046d174a272a6bb3c7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 27 04:59:31 2010 +0000

    2010-02-26  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Adam Barth.
    
            Change the default port for new-run-webkit-tests when running on
            a Mac from 'chromium-mac' to 'mac'. Add a '--chromium' switch to
            pick up the default platform-specific version of chromium instead.
    
            https://bugs.webkit.org/show_bug.cgi?id=35462
    
            * Scripts/webkitpy/layout_tests/port/factory.py:
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55341 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 49cb07e..00c5dc3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
 2010-02-26  Dirk Pranke  <dpranke at chromium.org>
 
+        Reviewed by Adam Barth.
+
+        Change the default port for new-run-webkit-tests when running on
+        a Mac from 'chromium-mac' to 'mac'. Add a '--chromium' switch to
+        pick up the default platform-specific version of chromium instead.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35462
+
+        * Scripts/webkitpy/layout_tests/port/factory.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
+2010-02-26  Dirk Pranke  <dpranke at chromium.org>
+
         Unreviewed, build fix
 
         third time's the charm getting this path right?
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py
index 432fef4..b6f530e 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py
@@ -44,7 +44,10 @@ def get(port_name=None, options=None):
         elif sys.platform == 'linux2':
             port_to_use = 'chromium-linux'
         elif sys.platform == 'darwin':
-            port_to_use = 'chromium-mac'
+            if options.chromium:
+                port_to_use = 'chromium-mac'
+            else:
+                port_to_use = 'mac'
 
     if port_to_use == 'test':
         import test
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 29bcfc7..003b9c3 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -1624,6 +1624,9 @@ def parse_args(args=None):
     option_parser.add_option("", "--nostart-helper",
                              action="store_true", default=False,
                              help="don't run layout_test_helper")
+    option_parser.add_option("", "--chromium",
+                             action="store_true", default=False,
+                             help="use the Chromium port")
     return option_parser.parse_args(args)
 
 if '__main__' == __name__:

-- 
WebKit Debian packaging