Changeset 172521 in webkit

Timestamp:

Aug 13, 2014 7:31:27 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Make check-webkit-style run sort-export-file
​https://bugs.webkit.org/show_bug.cgi?id=135877

Patch by Renato Nagy <​nagy.renato@stud.u-szeged.hu> on 2014-08-13
Reviewed by Csaba Osztrogonác.

• Scripts/webkitpy/style/checker.py:

(_all_categories):
(FileType):
(CheckerDispatcher._file_type):
(CheckerDispatcher._create_checker):

• Scripts/webkitpy/style/checkers/exportfile.py: Added.

(ExportFileChecker):
(ExportFileChecker.init):
(ExportFileChecker.check):

• Scripts/webkitpy/style/checkers/exportfile_unittest.py: Added.

(handle_style_error):
(MockErrorHandler):
(MockErrorHandler.init):
(MockErrorHandler.turn_off_line_filtering):
(MockErrorHandler.call):
(ExportFileTest):
(ExportFileTest.setUp):
(ExportFileTest.tearDown):
(ExportFileTest.test_sorted):
(ExportFileTest.test_non_sorted):
(ExportFileTest.test_parse_error):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (6 diffs)
• Scripts/webkitpy/style/checkers/exportfile.py (added)
• Scripts/webkitpy/style/checkers/exportfile_unittest.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-08-13  Renato Nagy  <nagy.renato@stud.u-szeged.hu>
+
+        Make check-webkit-style run sort-export-file
+        https://bugs.webkit.org/show_bug.cgi?id=135877
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitpy/style/checker.py:
+        (_all_categories):
+        (FileType):
+        (CheckerDispatcher._file_type):
+        (CheckerDispatcher._create_checker):
+        * Scripts/webkitpy/style/checkers/exportfile.py: Added.
+        (ExportFileChecker):
+        (ExportFileChecker.__init__):
+        (ExportFileChecker.check):
+        * Scripts/webkitpy/style/checkers/exportfile_unittest.py: Added.
+        (handle_style_error):
+        (MockErrorHandler):
+        (MockErrorHandler.__init__):
+        (MockErrorHandler.turn_off_line_filtering):
+        (MockErrorHandler.__call__):
+        (ExportFileTest):
+        (ExportFileTest.setUp):
+        (ExportFileTest.tearDown):
+        (ExportFileTest.test_sorted):
+        (ExportFileTest.test_non_sorted):
+        (ExportFileTest.test_parse_error):
+
 2014-08-13  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Tools/Scripts/webkitpy/style/checker.py

@@ -48 +48 @@
 from checkers.messagesin import MessagesInChecker
 from checkers.png import PNGChecker
+from checkers.exportfile import ExportFileChecker
 from checkers.python import PythonChecker
 from checkers.test_expectations import TestExpectationsChecker
@@ -307 +308 @@
 _PNG_FILE_EXTENSION = 'png'
 
+_EXPORT_FILE_PATH = [
+    'Source/WebCore/WebCore.exp.in',
+    'Source/WebKit/mac/WebKit.exp',
+    'Source/WebKit/mac/WebKit.mac.exp',
+    ]
+
 _CMAKE_FILE_EXTENSION = 'cmake'
 
@@ -357 +364 @@
     categories = categories.union(PNGChecker.categories)
     categories = categories.union(FeatureDefinesChecker.categories)
+    categories = categories.union(ExportFileChecker.categories)
 
     # FIXME: Consider adding all of the pep8 categories.  Since they
@@ -507 +515 @@
     CMAKE = 11
     FEATUREDEFINES = 12
+    EXPORTFILE = 13
 
 class CheckerDispatcher(object):
@@ -586 +595 @@
         elif file_extension == _PNG_FILE_EXTENSION:
             return FileType.PNG
+        elif file_path in _EXPORT_FILE_PATH:
+            return FileType.EXPORTFILE
         elif ((file_extension == _CMAKE_FILE_EXTENSION) or os.path.basename(file_path) == 'CMakeLists.txt'):
             return FileType.CMAKE
@@ -630 +641 @@
         elif file_type == FileType.PNG:
             checker = PNGChecker(file_path, handle_style_error)
+        elif file_type == FileType.EXPORTFILE:
+            checker = ExportFileChecker(file_path, handle_style_error)
         elif file_type == FileType.CMAKE:
             checker = CMakeChecker(file_path, handle_style_error)