Changeset 53383 in webkit

Timestamp:

Jan 17, 2010 6:39:12 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-17 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

style-check script reports loads of errors on gtk2drawing.c
​https://bugs.webkit.org/show_bug.cgi?id=33771

Exempt WebCore/platform/gtk/gtk2drawing.c and
WebCore/platform/gtk/gtk2drawing.h from style checks.

• Scripts/webkitpy/style/cpp_style.py:
• Scripts/webkitpy/style/cpp_style_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/cpp_style.py (modified) (2 diffs)
• Scripts/webkitpy/style/cpp_style_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-17  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        style-check script reports loads of errors on gtk2drawing.c
+        https://bugs.webkit.org/show_bug.cgi?id=33771
+
+        Exempt WebCore/platform/gtk/gtk2drawing.c and
+        WebCore/platform/gtk/gtk2drawing.h from style checks.
+
+        * Scripts/webkitpy/style/cpp_style.py:
+        * Scripts/webkitpy/style/cpp_style_unittest.py:
+
 2010-01-17  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/style/cpp_style.py

@@ -2898 +2898 @@
     if (filename != '-' and not can_handle(filename)):
         sys.stderr.write('Ignoring %s; not a .cpp, .c or .h file\n' % filename)
+    elif is_exempt(filename):
+        sys.stderr.write('Ignoring %s; This file is exempt from the style guide.\n' % filename)
     else:
         process_file_data(filename, file_extension, lines, error, verbosity)
@@ -2915 +2917 @@
      """
     return os.path.splitext(filename)[1] in ('.h', '.cpp', '.c')
+
+
+def is_exempt(filename):
+    """Checks if the given file is exempt from the style guide.  For example,
+    some files are purposefully mantained in Mozilla style to ease future
+    merges.
+
+    Args:
+      filename: A filename. It may contain directory names.
+     """
+    return os.path.basename(filename) in (
+        'gtk2drawing.c',
+        'gtk2drawing.h',
+    )

trunk/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py

@@ -3600 +3600 @@
         self.assert_(not cpp_style.can_handle('-'))
 
+    def test_is_exempt(self):
+        """Tests for cpp_style.is_exempt()."""
+        self.assert_(not cpp_style.is_exempt(''))
+        self.assert_(not cpp_style.is_exempt('foo.h'))
+        self.assert_(not cpp_style.is_exempt('foo.hpp'))
+        self.assert_(not cpp_style.is_exempt('foo.c'))
+        self.assert_(not cpp_style.is_exempt('foo.cpp'))
+        self.assert_(not cpp_style.is_exempt('-'))
+        self.assert_(cpp_style.is_exempt('gtk2drawing.h'))
+        self.assert_(cpp_style.is_exempt('WebCore/platform/gtk/gtk2drawing.h'))
+        self.assert_(cpp_style.is_exempt('gtk2drawing.c'))
+        self.assert_(cpp_style.is_exempt('WebCore/platform/gtk/gtk2drawing.c'))
 
 def tearDown():