Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json

Issue 2174883002: [Android] Root devices before asan_device_setup.sh. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/api.py ('k') | scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
index 5d9608fcf2c6839f056fbc6289ab807c454bab9c..454abe3b20bc16edb33dc628f28dbccb8e44f4a1 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
@@ -529,6 +529,68 @@
]
},
{
+ "cmd": [],
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "LLVM_FORCE_HEAD_REVISION": "YES",
+ "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
+ },
+ "name": "Set up ASAN on devices"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::adb]/resources/list_devices.py",
+ "['[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
+ "/path/to/tmp/json"
+ ],
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "LLVM_FORCE_HEAD_REVISION": "YES",
+ "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
+ },
+ "name": "Set up ASAN on devices.List adb devices",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@[@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@",
+ "@@@STEP_LOG_LINE@json.output@]@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
+ "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools/adb",
+ "014E1F310401C009"
+ ],
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "LLVM_FORCE_HEAD_REVISION": "YES",
+ "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
+ },
+ "name": "Set up ASAN on devices.Root devices",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'root'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (device)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
"cmd": [
"[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/tools/android/asan/third_party/asan_device_setup.sh",
"--lib",
@@ -543,7 +605,10 @@
"LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
},
- "name": "Set up ASAN on device 07a00ca4"
+ "name": "Set up ASAN on devices.07a00ca4",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -743,6 +808,16 @@
"name": "stack_tool_for_asan"
},
{
+ "cmd": [],
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "LLVM_FORCE_HEAD_REVISION": "YES",
+ "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
+ },
+ "name": "Tear down ASAN on devices"
+ },
+ {
"cmd": [
"[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/tools/android/asan/third_party/asan_device_setup.sh",
"--revert",
@@ -756,7 +831,10 @@
"LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
},
- "name": "Tear down ASAN on device 07a00ca4"
+ "name": "Tear down ASAN on devices.07a00ca4",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/api.py ('k') | scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698