Title: [161510] trunk/Tools
- Revision
- 161510
- Author
- [email protected]
- Date
- 2014-01-08 09:48:04 -0800 (Wed, 08 Jan 2014)
Log Message
Unreviewed, rolling out r161427.
http://trac.webkit.org/changeset/161427
https://bugs.webkit.org/show_bug.cgi?id=126645
Emits a stye error on any newly added files (Requested by ap
on #webkit).
* Scripts/webkitpy/style/checkers/cpp.py:
(check_style):
(CppChecker):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(WebKitStyleTest.test_other):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (161509 => 161510)
--- trunk/Tools/ChangeLog 2014-01-08 17:14:02 UTC (rev 161509)
+++ trunk/Tools/ChangeLog 2014-01-08 17:48:04 UTC (rev 161510)
@@ -1,3 +1,18 @@
+2014-01-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r161427.
+ http://trac.webkit.org/changeset/161427
+ https://bugs.webkit.org/show_bug.cgi?id=126645
+
+ Emits a stye error on any newly added files (Requested by ap
+ on #webkit).
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_style):
+ (CppChecker):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (WebKitStyleTest.test_other):
+
2014-01-08 Peter Molnar <[email protected]>
Remove run-webkit-tests wrapper script as all platform are using NRWT now.
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (161509 => 161510)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-01-08 17:14:02 UTC (rev 161509)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-01-08 17:48:04 UTC (rev 161510)
@@ -2719,15 +2719,7 @@
check_indentation_amount(clean_lines, line_number, error)
check_enum_casing(clean_lines, line_number, enum_state, error)
- # #defined constants should use all uppercase names with words separated by underscores.
- define_check = match(r'#define\s(?P<name>[\w_]+)(\s.*|\s?)$', line)
- if define_check:
- name = define_check.group('name')
- if not match(r'^[0-9A-Z_]+$', name):
- error(line_number, 'readability/naming/define/constants', 4,
- name + " is incorrect. #defined constants should use all uppercase names with words separated by underscores.")
-
_RE_PATTERN_INCLUDE_NEW_STYLE = re.compile(r'#include +"[^/]+\.h"')
_RE_PATTERN_INCLUDE = re.compile(r'^\s*#\s*include\s*([<"])([^>"]*)[>"].*$')
# Matches the first component of a filename delimited by -s and _s. That is:
@@ -3708,7 +3700,6 @@
'readability/parameter_name',
'readability/naming',
'readability/naming/underscores',
- 'readability/naming/define/constants',
'readability/null',
'readability/pass_ptr',
'readability/streams',
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (161509 => 161510)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2014-01-08 17:14:02 UTC (rev 161509)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2014-01-08 17:48:04 UTC (rev 161510)
@@ -5026,20 +5026,7 @@
# FIXME: Implement this.
pass
- def test_define_constants(self):
- bad_name_error = " is incorrect. #defined constants should use all uppercase names with words separated by underscores. [readability/naming/define/constants] [4]"
- self.assert_lint('#define lower1case', 'lower1case' + bad_name_error)
- self.assert_lint('#define UPPER1CASE', '')
- self.assert_lint('#define mixed1CASE', 'mixed1CASE' + bad_name_error)
- self.assert_lint('#define lower_1case', 'lower_1case' + bad_name_error)
- self.assert_lint('#define UPPER_1CASE', '')
- self.assert_lint('#define mixed_1CASE', 'mixed_1CASE' + bad_name_error)
- self.assert_lint('#define dlower1case some(bla)', 'dlower1case' + bad_name_error)
- self.assert_lint('#define DUPPER1CASE dd(foo)', '')
- self.assert_lint('#define Dmixed1CASE dkjgh[sdf]', 'Dmixed1CASE' + bad_name_error)
-
-
class CppCheckerTest(unittest.TestCase):
"""Tests CppChecker class."""
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
