diff options
| author | Xin Chen <xinchan@google.com> | 2017-02-22 07:26:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-22 07:26:39 +0000 |
| commit | a6dbd69adc0601dd6922cf26e7954c23930d0f35 (patch) | |
| tree | 3d4e8e5a516a2815594287c9a2b3aca20d006a70 | |
| parent | a7e4aeadf68fede7101b3e6268dc9824c5c283c7 (diff) | |
| parent | a78fa2dceeb4161630cc95eb0413b6f1ca349dd2 (diff) | |
| download | adt-infra-a6dbd69adc0601dd6922cf26e7954c23930d0f35.tar.gz | |
Merge "Revert "Run test_adb and test_device on emulator buildbot"" am: e9fd678be2
am: a78fa2dcee
Change-Id: I4d979660d51737284e087733059711f2a632ef83
| -rw-r--r-- | build/scripts/slave/recipes/adt/adb.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/build/scripts/slave/recipes/adt/adb.py b/build/scripts/slave/recipes/adt/adb.py index 3084edb8..807cb87a 100644 --- a/build/scripts/slave/recipes/adt/adb.py +++ b/build/scripts/slave/recipes/adt/adb.py @@ -12,7 +12,6 @@ DEPS = [ 'platform', 'properties', 'python', - 'repo', 'step', ] @@ -34,14 +33,7 @@ def RunSteps(api): android_sdk_home = api.path.join(os.path.expanduser('~'), 'Android', 'android-sdk_public') platform_tools_dir = api.path.join(android_sdk_home, 'platform-tools') env_path = ['%(PATH)s', platform_tools_dir] - env = {'PATH': api.path.pathsep.join(env_path), - 'PYTHONPATH': api.path['slave_build'].join('development', 'python-packages')} - - api.repo.init('persistent-https://android.googlesource.com/platform/manifest', '--depth=1') - api.repo.reset() - api.repo.clean('-x') - api.repo.sync('-c', 'system/core') - api.repo.sync('-c', 'development') + env = {'PATH': api.path.pathsep.join(env_path)} # Run adb stree tests with api.step.defer_results(): @@ -57,13 +49,6 @@ def RunSteps(api): stderr_output = deferred_step_result.get_error().result.stderr print stderr_output - for test in ['test_adb.py', 'test_device.py']: - test_path = api.path.join(api.path['slave_build'], 'system', 'core', 'adb', test) - deferred_step_result = api.python('Run %s' % test, test_path, env=env) - if not deferred_step_result.is_ok: # pragma: no cover - stderr_output = deferred_step_result.get_error().result.stderr - print stderr_output - # Upload logs to GCS (gs://adb_test_traces/) script_root = api.path.join(build_dir, os.pardir, 'emu_test') log_util_path = api.path.join(script_root, 'utils', 'zip_upload_logs.py') |