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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 2bfc118b6a9a1fd3a6fbf82aaf72363b0472551e
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 17:22:49 2010 +0000

    2010-09-24  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            NRWT doesn't respect config set with set-webkit-configuration
            https://bugs.webkit.org/show_bug.cgi?id=46278
    
            Use Port.default_configuration() instead of hardcoding Release in
            ChromiumPort configuration initialization, so that we still inherit the
            configuration set by set-webkit-configuration.
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
            * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ab2d1f6..79ed1e9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-24  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        NRWT doesn't respect config set with set-webkit-configuration
+        https://bugs.webkit.org/show_bug.cgi?id=46278
+        
+        Use Port.default_configuration() instead of hardcoding Release in
+        ChromiumPort configuration initialization, so that we still inherit the
+        configuration set by set-webkit-configuration.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
 2010-09-24  Chang Shu  <chang.shu at nokia.com>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 4f3d734..a72627a 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -83,12 +83,12 @@ class ChromiumPort(base.Port):
     """Abstract base class for Chromium implementations of the Port class."""
 
     def __init__(self, **kwargs):
+        base.Port.__init__(self, **kwargs)
         if 'options' in kwargs:
             options = kwargs['options']
             if (options and (not hasattr(options, 'configuration') or
                              options.configuration is None)):
-                options.configuration = 'Release'
-        base.Port.__init__(self, **kwargs)
+                options.configuration = self.default_configuration()
         self._chromium_base_dir = None
 
     def baseline_path(self):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
index 1cfbde1..a4a9ea6 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
@@ -83,19 +83,39 @@ class ChromiumDriverTest(unittest.TestCase):
         self.driver._proc.stdout.readline = mock_readline
         self._assert_write_command_and_read_line(expected_crash=True)
 
+
+class ChromiumPortTest(unittest.TestCase):
+    class TestMacPort(chromium_mac.ChromiumMacPort):
+        def __init__(self, options):
+            chromium_mac.ChromiumMacPort.__init__(self,
+                                                  port_name='test-port',
+                                                  options=options)
+
+        def default_configuration(self):
+            self.default_configuration_called = True
+            return 'default'
+
+    class TestLinuxPort(chromium_linux.ChromiumLinuxPort):
+        def __init__(self, options):
+            chromium_linux.ChromiumLinuxPort.__init__(self,
+                                                      port_name='test-port',
+                                                      options=options)
+
+        def default_configuration(self):
+            self.default_configuration_called = True
+            return 'default'
+
     def test_path_to_image_diff(self):
         class MockOptions:
             def __init__(self):
                 self.use_drt = True
 
-        port = chromium_linux.ChromiumLinuxPort(port_name='test-port',
-                                                options=MockOptions())
+        port = ChromiumPortTest.TestLinuxPort(options=MockOptions())
         self.assertTrue(port._path_to_image_diff().endswith(
-            '/out/Release/ImageDiff'))
-        port = chromium_mac.ChromiumMacPort(port_name='test-port',
-                                            options=MockOptions())
+            '/out/default/ImageDiff'), msg=port._path_to_image_diff())
+        port = ChromiumPortTest.TestMacPort(options=MockOptions())
         self.assertTrue(port._path_to_image_diff().endswith(
-            '/xcodebuild/Release/ImageDiff'))
+            '/xcodebuild/default/ImageDiff'))
         # FIXME: Figure out how this is going to work on Windows.
         #port = chromium_win.ChromiumWinPort('test-port', options=MockOptions())
 
@@ -104,8 +124,7 @@ class ChromiumDriverTest(unittest.TestCase):
             def __init__(self):
                 self.use_drt = True
 
-        port = chromium_linux.ChromiumLinuxPort(port_name='test-port',
-                                                options=MockOptions())
+        port = ChromiumPortTest.TestLinuxPort(options=MockOptions())
 
         fake_test = os.path.join(port.layout_tests_dir(), "fast/js/not-good.js")
 
@@ -118,5 +137,24 @@ DEFER LINUX WIN : fast/js/very-good.js = TIMEOUT PASS"""
         skipped_tests = port.skipped_layout_tests(extra_test_files=[fake_test, ])
         self.assertTrue("fast/js/not-good.js" in skipped_tests)
 
+    def test_default_configuration(self):
+        class EmptyOptions:
+            def __init__(self):
+                pass
+
+        options = EmptyOptions()
+        port = ChromiumPortTest.TestLinuxPort(options)
+        self.assertEquals(options.configuration, 'default')
+        self.assertTrue(port.default_configuration_called)
+
+        class OptionsWithUnsetConfiguration:
+            def __init__(self):
+                self.configuration = None
+
+        options = OptionsWithUnsetConfiguration()
+        port = ChromiumPortTest.TestLinuxPort(options)
+        self.assertEquals(options.configuration, 'default')
+        self.assertTrue(port.default_configuration_called)
+
 if __name__ == '__main__':
     unittest.main()

-- 
WebKit Debian packaging