summaryrefslogtreecommitdiffstats
path: root/build/android/PRESUBMIT.py
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-12-14 14:12:02 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-14 22:13:10 +0000
commita83d25fbaac0f8a92538a79af87bdedc0f888233 (patch)
tree5eb4c9bacdf6276c3efbdd4ef98c684334b1981a /build/android/PRESUBMIT.py
parent91b293fb04a40e20157ad4388f2e11649ac87921 (diff)
downloadchromium_src-a83d25fbaac0f8a92538a79af87bdedc0f888233.zip
chromium_src-a83d25fbaac0f8a92538a79af87bdedc0f888233.tar.gz
chromium_src-a83d25fbaac0f8a92538a79af87bdedc0f888233.tar.bz2
[Android] Add a presubmit for devil/.
BUG=476719 Review URL: https://codereview.chromium.org/1517243003 Cr-Commit-Position: refs/heads/master@{#365107}
Diffstat (limited to 'build/android/PRESUBMIT.py')
-rw-r--r--build/android/PRESUBMIT.py24
1 files changed, 2 insertions, 22 deletions
diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py
index ad8ca1f..8cfe59c 100644
--- a/build/android/PRESUBMIT.py
+++ b/build/android/PRESUBMIT.py
@@ -27,8 +27,8 @@ def CommonChecks(input_api, output_api):
input_api,
output_api,
pylintrc='pylintrc',
- # symbols has its own PRESUBMIT.py
- black_list=build_pys + [r'pylib/symbols/.*\.py$'],
+ # devil and symbols have their own PRESUBMIT.py
+ black_list=build_pys + [r'devil/.*\.py$', r'pylib/symbols/.*\.py$'],
extra_paths_list=[J(), J('buildbot')]))
output.extend(input_api.canned_checks.RunPylint(
input_api,
@@ -60,26 +60,6 @@ def CommonChecks(input_api, output_api):
],
env=pylib_test_env))
-
- devil_test_env = dict(pylib_test_env)
- devil_test_env.update({
- 'DEVIL_ENV_CONFIG':
- input_api.os_path.join(build_android_dir, 'devil_chromium.json')
- })
- output.extend(input_api.canned_checks.RunUnitTests(
- input_api,
- output_api,
- unit_tests=[
- J('devil', 'devil_env_test.py'),
- J('devil', 'android', 'battery_utils_test.py'),
- J('devil', 'android', 'device_utils_test.py'),
- J('devil', 'android', 'fastboot_utils_test.py'),
- J('devil', 'android', 'md5sum_test.py'),
- J('devil', 'android', 'logcat_monitor_test.py'),
- J('devil', 'utils', 'cmd_helper_test.py'),
- J('devil', 'utils', 'timeout_retry_unittest.py'),
- ],
- env=devil_test_env))
return output