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

dpranke at chromium.org dpranke at chromium.org
Wed Dec 22 13:10:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ff54e5c983dd27901c84aeb451b687e247a4925c
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 03:01:14 2010 +0000

    2010-09-07  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix
    
            Missed one test in mac_unittest.py in previous change; for some
            reason the method is listed twice. I will fix both for now, but will
            figure this out in a later, not-time-sensitive patch.
    
            https://bugs.webkit.org/show_bug.cgi?id=45357
    
            * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 74dca62..47c9ed7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-07  Dirk Pranke  <dpranke at chromium.org>
+
+        Unreviewed, build fix
+
+        Missed one test in mac_unittest.py in previous change; for some
+        reason the method is listed twice. I will fix both for now, but will
+        figure this out in a later, not-time-sensitive patch.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45357
+
+        * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+
 2010-09-07  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
index 16c87d3..327b19e 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
@@ -71,6 +71,8 @@ svg/batik/text/smallFonts.svg
 
     def test_skipped_file_paths(self):
         port = self.make_port()
+        if not port:
+            return
         skipped_file = StringIO.StringIO(self.example_skipped_file)
         self.assertEqual(port._tests_from_skipped_file(skipped_file), self.example_skipped_tests)
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list