2010-10-04 Dirk Pranke <dpranke@chromium.org>

        Unreviewed, build fix.

        Handle crash introduced in r69040 if we are not running in a
        Chromium checkout.

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

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ca8e43b29e3c562d0d3ba82365aadd06f74d85d6..3e8be7140f0fc4d75ea5185cccebfdbaecdc4d13 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-04  Dirk Pranke  <dpranke@chromium.org>
+
+        Unreviewed, build fix.
+
+        Handle crash introduced in r69040 if we are not running in a
+        Chromium checkout.
+
+        * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
+
 2010-10-04  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Tony Chang.

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
index fb924280c40d3a19b446caa47d9c3d758aa52e03..c4c885d6329ab3d0bbafaaeca17343a464ee7a35 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
@@ -88,8 +88,11 @@ class GetGoogleChromePortTest(unittest.TestCase):
             os.path.exists = mock_exists_chrome_found
             codecs.open = mock_open
             chrome_overrides = port.test_expectations_overrides()
-            self.assertEqual(chrome_overrides,
-                             chromium_overrides + expected_string)
+            if chromium_overrides:
+                self.assertEqual(chrome_overrides,
+                                 chromium_overrides + expected_string)
+            else:
+                self.assertEqual(chrome_overrides, expected_string)
         finally:
             os.path.exists = orig_exists
             codecs.open = orig_open