remove 'debugging' step
This can take a few minutes, a fair chunk of some runs.
E.g. https://ci.chromium.org/raw/build/logs.chromium.org/skia/51ee56ccc7f9ba11/+/annotations
debugging 2m32s (17%)
+ dm 11m17s (77%)
+ other 54s ( 6%)
= total 14m43s
should become more like
dm 11m17s (93%)
+ other 54s ( 7%)
= total 12m11s
Change-Id: I8bdbc280f5d581d98b08e471613401eee507064e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375184
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py
index 208b201..c4b8747 100644
--- a/infra/bots/recipe_modules/flavor/android.py
+++ b/infra/bots/recipe_modules/flavor/android.py
@@ -518,21 +518,6 @@
self._adb('push %s' % sh,
'push', self.m.vars.tmp_dir.join(sh), self.device_dirs.bin_dir)
- self.m.python.inline('debugging', """
- import subprocess
- def run(*cmd):
- print('====================================')
- print(' '.join(cmd))
- print('====================================')
- subprocess.call(cmd)
- adb = '%s'
- run('uptime')
- run(adb, 'shell', 'uptime')
- run(adb, 'shell', 'ps')
- run(adb, 'logcat', '-d')
- """ % self.ADB_BINARY,
- args=[self.device_dirs.bin_dir, sh])
-
self._adb('clear log', 'logcat', '-c')
self.m.python.inline('%s' % cmd[0], """
import subprocess
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
index 60b0948..4e04566 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
@@ -893,31 +893,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
index b4e0a94..d6b75ac 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
@@ -926,31 +926,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index a9e949d..60021a3 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -909,31 +909,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
index 3e16733..5e3079f 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
@@ -1118,31 +1118,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
index 51cc2bb..eba4cc7 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -1287,31 +1287,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
index cebceac..c96902f 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json
@@ -671,31 +671,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
index 306d23f..5ee9e45 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
@@ -951,31 +951,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index 8e64909..8ac05d9 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -909,31 +909,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
index 47e3c7f..e9e4435 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -1193,31 +1193,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
index e1ccf00..8f6ad7c 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
@@ -1283,31 +1283,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
index 786e0c8..8554953 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
@@ -951,31 +951,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
index 307a12f..7cccf05 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
@@ -1362,31 +1362,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
index 223c1db..643c493 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
@@ -1287,31 +1287,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
index 1fcf4ce..ea56e96 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
@@ -1336,31 +1336,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
index 0936fed..d01d709 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
@@ -1337,31 +1337,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
index 02573c4..8b7c9aa 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
@@ -1101,35 +1101,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/usr/bin/adb.1.0.35'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "nanobench.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/usr/bin/adb.1.0.35'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/usr/bin/adb.1.0.35",
"logcat",
"-c"
diff --git a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
index fa9c5b1..d6cc1fc 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
@@ -468,35 +468,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
@@ -711,35 +682,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
@@ -954,35 +896,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
index b3eaf11..57b4b72 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
@@ -468,35 +468,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
index 9ea21c4..2e9c7a8 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
@@ -468,35 +468,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
@@ -711,35 +682,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
@@ -954,35 +896,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/opt/infra-android/tools/adb'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/opt/infra-android/tools/adb'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/opt/infra-android/tools/adb",
"logcat",
"-c"
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json
index 2a4b4aa..7d04078 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json
@@ -1050,35 +1050,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/usr/bin/adb.1.0.35'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/usr/bin/adb.1.0.35'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/usr/bin/adb.1.0.35",
"logcat",
"-c"
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
index 43113bc..fc5c342 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
@@ -1213,35 +1213,6 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\ndef run(*cmd):\n print('====================================')\n print(' '.join(cmd))\n print('====================================')\n subprocess.call(cmd)\nadb = '/usr/bin/adb.1.0.35'\nrun('uptime')\nrun(adb, 'shell', 'uptime')\nrun(adb, 'shell', 'ps')\nrun(adb, 'logcat', '-d')\n",
- "/data/local/tmp/",
- "dm.sh"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
- },
- "name": "debugging",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@def run(*cmd):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ print(' '.join(cmd))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print('====================================')@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.call(cmd)@@@",
- "@@@STEP_LOG_LINE@python.inline@adb = '/usr/bin/adb.1.0.35'@@@",
- "@@@STEP_LOG_LINE@python.inline@run('uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'uptime')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'shell', 'ps')@@@",
- "@@@STEP_LOG_LINE@python.inline@run(adb, 'logcat', '-d')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
"/usr/bin/adb.1.0.35",
"logcat",
"-c"
