diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-05 14:43:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-05 21:45:17 +0000 |
| commit | f7280993a941acd40628664d108d7a7ed36be17e (patch) | |
| tree | abaa4b94c642330cc0abfe93357dceccbcc849a4 /build/android/PRESUBMIT.py | |
| parent | 9cbf3fab244508983057d62f4583fc165ab5e73c (diff) | |
| download | chromium_src-f7280993a941acd40628664d108d7a7ed36be17e.zip chromium_src-f7280993a941acd40628664d108d7a7ed36be17e.tar.gz chromium_src-f7280993a941acd40628664d108d7a7ed36be17e.tar.bz2 | |
Revert of [Android] Add a configurable environment for devil/. (patchset #12 id:220001 of https://codereview.chromium.org/1316413003/ )
Reason for revert:
breaks on non-default output directories.
Original issue's description:
> [Android] Add a configurable environment for devil/.
>
> BUG=476719
>
> Committed: https://crrev.com/975fc02186d195c3baf6f0380fed06433c636670
> Cr-Commit-Position: refs/heads/master@{#352359}
TBR=aiolos@chromium.org,mikecase@chromium.org,nednguyen@google.com,perezju@chromium.org,rnephew@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=476719
Review URL: https://codereview.chromium.org/1390613002
Cr-Commit-Position: refs/heads/master@{#352436}
Diffstat (limited to 'build/android/PRESUBMIT.py')
| -rw-r--r-- | build/android/PRESUBMIT.py | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py index d7a3ae1..a75bf94 100644 --- a/build/android/PRESUBMIT.py +++ b/build/android/PRESUBMIT.py @@ -12,12 +12,9 @@ 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(build_android_dir, *dirs) + return input_api.os_path.join(input_api.PresubmitLocalPath(), *dirs) build_pys = [ r'gyp/.*\.py$', @@ -43,7 +40,7 @@ def CommonChecks(input_api, output_api): pylib_test_env = dict(input_api.environ) pylib_test_env.update({ - 'PYTHONPATH': build_android_dir, + 'PYTHONPATH': input_api.PresubmitLocalPath(), 'PYTHONDONTWRITEBYTECODE': '1', }) output.extend(input_api.canned_checks.RunUnitTests( @@ -51,6 +48,11 @@ 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'), @@ -59,26 +61,6 @@ 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 |