Title: [160090] trunk/Tools
- Revision
- 160090
- Author
- [email protected]
- Date
- 2013-12-04 05:49:39 -0800 (Wed, 04 Dec 2013)
Log Message
Style checker requires alphabetical ordering in cmake lists even it contains variable.
https://bugs.webkit.org/show_bug.cgi?id=124918
Patch by Gergo Balogh <[email protected]> on 2013-12-04
Reviewed by Csaba Osztrogonác.
* Scripts/webkitpy/style/checkers/cmake_unittest.py:
(CMakeCheckerTest.test_check):
* Scripts/webkitpy/style/checkers/cmake.py:
(CMakeChecker._check_list_order):
This will ignore lines with variable substitution.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (160089 => 160090)
--- trunk/Tools/ChangeLog 2013-12-04 12:30:27 UTC (rev 160089)
+++ trunk/Tools/ChangeLog 2013-12-04 13:49:39 UTC (rev 160090)
@@ -1,3 +1,16 @@
+2013-12-04 Gergo Balogh <[email protected]>
+
+ Style checker requires alphabetical ordering in cmake lists even it contains variable.
+ https://bugs.webkit.org/show_bug.cgi?id=124918
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/style/checkers/cmake_unittest.py:
+ (CMakeCheckerTest.test_check):
+ * Scripts/webkitpy/style/checkers/cmake.py:
+ (CMakeChecker._check_list_order):
+ This will ignore lines with variable substitution.
+
2013-12-04 László Langó <[email protected]>
check-webkit-style is wrong about expected format parameter pack rvalue reference arguments
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py (160089 => 160090)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2013-12-04 12:30:27 UTC (rev 160089)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2013-12-04 13:49:39 UTC (rev 160090)
@@ -153,6 +153,9 @@
line_number = 0
for line in lines:
+ matched = search('\$\{.*\}', line)
+ if matched:
+ continue
line_number += 1
line = line.strip()
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py (160089 => 160090)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py 2013-12-04 12:30:27 UTC (rev 160089)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py 2013-12-04 13:49:39 UTC (rev 160090)
@@ -90,6 +90,7 @@
'c/a.a\n',
'\n',
'c/b/a.a\n',
+ '${aVariable}\n',
'\n',
'c/c.c\n',
'\n',
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
