From e9eaf62130f161faaf007c3af5da2ba5103c16cc Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Wed, 2 Nov 2016 17:32:34 -0700 Subject: [PATCH] Correct the previous patch for test file subpaths in Checkstyle. Instead of /tests/* allow /src/test/* subpath to be marked as test code. Test: None Change-Id: I6e9699a34de6d2bc167afa80539949be5a6a8907 --- tools/checkstyle/checkstyle.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/checkstyle/checkstyle.py b/tools/checkstyle/checkstyle.py index e314251de..05ad1e1cb 100755 --- a/tools/checkstyle/checkstyle.py +++ b/tools/checkstyle/checkstyle.py @@ -36,8 +36,7 @@ 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/', - '/test/java/', '/test/src/', '/test/test-data/'] +SUBPATH_FOR_TEST_FILES = ['/tests/java/', '/tests/src/', '/tests/test-data/', '/src/test/'] 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'