Merge "Add androidTest to test folder names." am: 35b0cafbc2 am: 5f503e25b8

am: 3b4f393ca4

Change-Id: I8fdd38f6738345a320c842bad905559514586eb2
This commit is contained in:
Aurimas Liutikas
2016-12-09 00:07:01 +00:00
committed by android-build-merger

View File

@@ -60,7 +60,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/', '/test/']
SUBPATH_FOR_TEST_FILES = ['/tests/', '/test/', '/androidTest/']
SUBPATH_FOR_TEST_DATA_FILES = _FindFoldersContaining(os.path.dirname(os.getcwd()),
"IGNORE_CHECKSTYLE")
ERROR_UNCOMMITTED = 'You need to commit all modified files before running Checkstyle\n'