diff options
Diffstat (limited to 'build/android/PRESUBMIT.py')
| -rw-r--r-- | build/android/PRESUBMIT.py | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py index a75bf94..d7a3ae1 100644 --- a/build/android/PRESUBMIT.py +++ b/build/android/PRESUBMIT.py @@ -12,9 +12,12 @@ details on the presubmit API built into depot_tools. def CommonChecks(input_api, output_api): output = [] + build_android_dir = input_api.PresubmitLocalPath() + chromium_src_dir = input_api.os_path.join(build_android_dir, '..', '..') + def J(*dirs): """Returns a path relative to presubmit directory.""" - return input_api.os_path.join(input_api.PresubmitLocalPath(), *dirs) + return input_api.os_path.join(build_android_dir, *dirs) build_pys = [ r'gyp/.*\.py$', @@ -40,7 +43,7 @@ def CommonChecks(input_api, output_api): pylib_test_env = dict(input_api.environ) pylib_test_env.update({ - 'PYTHONPATH': input_api.PresubmitLocalPath(), + 'PYTHONPATH': build_android_dir, 'PYTHONDONTWRITEBYTECODE': '1', }) output.extend(input_api.canned_checks.RunUnitTests( @@ -48,11 +51,6 @@ def CommonChecks(input_api, output_api): output_api, unit_tests=[ J('.', 'emma_coverage_stats_test.py'), - J('devil', 'android', 'battery_utils_test.py'), - J('devil', 'android', 'device_utils_test.py'), - J('devil', 'android', 'md5sum_test.py'), - J('devil', 'android', 'logcat_monitor_test.py'), - J('devil', 'utils', 'timeout_retry_unittest.py'), J('gyp', 'util', 'md5_check_test.py'), J('pylib', 'base', 'test_dispatcher_unittest.py'), J('pylib', 'gtest', 'gtest_test_instance_test.py'), @@ -61,6 +59,26 @@ def CommonChecks(input_api, output_api): J('pylib', 'results', 'json_results_test.py'), ], env=pylib_test_env)) + + + devil_test_env = dict(pylib_test_env) + devil_test_env.update({ + 'DEVIL_BINARY_DIR': + input_api.os_path.join(chromium_src_dir, 'output', 'directory'), + 'DEVIL_PYMOCK_PATH': + input_api.os_path.join(chromium_src_dir, 'third_party', 'pymock') + }) + output.extend(input_api.canned_checks.RunUnitTests( + input_api, + output_api, + unit_tests=[ + J('devil', 'android', 'battery_utils_test.py'), + J('devil', 'android', 'device_utils_test.py'), + J('devil', 'android', 'md5sum_test.py'), + J('devil', 'android', 'logcat_monitor_test.py'), + J('devil', 'utils', 'timeout_retry_unittest.py'), + ], + env=devil_test_env)) return output |