2010-09-23 Dirk Pranke <dpranke@chromium.org>

        Unreviewed, build fix.

        r68008 broke new-run-webkit-tests in that the chromium ports no
        longer respect set-webkit-configuration. The correct fix for this
        is being pursued in bug 46278 (along with a bunch of unit tests),
        but in the meantime I'm reverting the particular lines that broke
        things. This was tested by hand.

        * Scripts/webkitpy/layout_tests/port/chromium.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 183e17ba5e9a73939bc7ef49c0a59ca10dfac7bf..3f09e83092e4ad9bc6a2580e186ecae6eba6c211 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-23  Dirk Pranke  <dpranke@chromium.org>
+
+        Unreviewed, build fix.
+
+        r68008 broke new-run-webkit-tests in that the chromium ports no
+        longer respect set-webkit-configuration. The correct fix for this
+        is being pursued in bug 46278 (along with a bunch of unit tests),
+        but in the meantime I'm reverting the particular lines that broke
+        things. This was tested by hand.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-09-23  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 4f3d7345e5399a12e2f1871b241fcce77947cde3..f22e4ae8a124c95ab365f3f6518666f0780faebf 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -83,10 +83,11 @@ class ChromiumPort(base.Port):
     """Abstract base class for Chromium implementations of the Port class."""
 
     def __init__(self, **kwargs):
+        import pdb
+        pdb.set_trace()
         if 'options' in kwargs:
             options = kwargs['options']
-            if (options and (not hasattr(options, 'configuration') or
-                             options.configuration is None)):
+            if (options and not hasattr(options, 'configuration')):
                 options.configuration = 'Release'
         base.Port.__init__(self, **kwargs)
         self._chromium_base_dir = None