[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 ca736b962ed60d9a3e0a6f7e9ef61bf5cde3f634
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 01:49:39 2010 +0000

    2010-01-17  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            style-queue complains about missing #include of config.h for non-WebCore projects
            https://bugs.webkit.org/show_bug.cgi?id=33170
    
            WebKitAPITests are consumers of the WebKit API and therefore do not
            need to follow the same include discipline as the rest of WebKit.  This
            patch exempts them from the include checks.
    
            * Scripts/webkitpy/style/cpp_style.py:
            * Scripts/webkitpy/style/cpp_style_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53380 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 60642e8..c26abb3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Eric Seidel.
 
+        style-queue complains about missing #include of config.h for non-WebCore projects
+        https://bugs.webkit.org/show_bug.cgi?id=33170
+
+        WebKitAPITests are consumers of the WebKit API and therefore do not
+        need to follow the same include discipline as the rest of WebKit.  This
+        patch exempts them from the include checks.
+
+        * Scripts/webkitpy/style/cpp_style.py:
+        * Scripts/webkitpy/style/cpp_style_unittest.py:
+
+2010-01-17  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         EWS (Early Warning Systems) should build both debug and release
         https://bugs.webkit.org/show_bug.cgi?id=33681
 
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style.py b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
index 3940a75..a8a87d9 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
@@ -2108,6 +2108,12 @@ def check_include_line(filename, clean_lines, line_number, include_state, error)
       error: The function to call with any errors found.
     """
 
+    if filename.find('WebKitTools/WebKitAPITest/') >= 0:
+        # Files in this directory are consumers of the WebKit API and
+        # therefore do not follow the same header including discipline as
+        # WebCore.
+        return
+
     line = clean_lines.lines[line_number]
 
     matched = _RE_PATTERN_INCLUDE.search(line)
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
index 4d2f2e6..a9edec2 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
@@ -2027,6 +2027,11 @@ class OrderOfIncludesTest(CppStyleTestBase):
                                          '#include <assert.h>\n',
                                          '')
 
+    def test_webkit_api_test_excluded(self):
+        self.assert_language_rules_check('WebKitTools/WebKitAPITest/Test.h',
+                                         '#include "foo.h"\n',
+                                         '')
+
     def test_check_line_break_after_own_header(self):
         self.assert_language_rules_check('foo.cpp',
                                          '#include "config.h"\n'

-- 
WebKit Debian packaging