From 5a4c535344472aac657ac4b5b823740df4526743 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Wed, 2 Nov 2016 16:00:01 -0700 Subject: [PATCH] Expand the allowed subpaths for test directories. Include /test/* in addition to /tests/*. Test: None Change-Id: I3f09596cfe97c40bb3c30288de2e6696c4a5725b --- tools/checkstyle/checkstyle.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/checkstyle/checkstyle.py b/tools/checkstyle/checkstyle.py index 4c3bf17f6..e314251de 100755 --- a/tools/checkstyle/checkstyle.py +++ b/tools/checkstyle/checkstyle.py @@ -36,7 +36,8 @@ FORCED_RULES = ['com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck 'com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck'] SKIPPED_RULES_FOR_TEST_FILES = ['com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck', 'com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck'] -SUBPATH_FOR_TEST_FILES = ['/tests/java/', '/tests/src/', '/tests/test-data/'] +SUBPATH_FOR_TEST_FILES = ['/tests/java/', '/tests/src/', '/tests/test-data/', + '/test/java/', '/test/src/', '/test/test-data/'] ERROR_UNCOMMITTED = 'You need to commit all modified files before running Checkstyle\n' ERROR_UNTRACKED = 'You have untracked java files that are not being checked:\n'