scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json - Issue 1465343002: [Android] Add context manager to record logcat during step(s).

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

Issue 1465343002: [Android] Add context manager to record logcat during step(s). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 5 years, 1 month 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

« scripts/slave/recipe_modules/chromium_android/example.py ('K') | « scripts/slave/recipes/android_webview_shell_tests.expected/basic.json ('k') | scripts/slave/recipes/chromium.expected/amp_split_recipe_instrumentation_trigger_failure.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json

diff --git a/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json

index 5af92ba860de6b9081d2020f4a780eca51b7fcaf..47f4ad472cb0f13e2c910636f30d7d9efff1932c 100644

--- a/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json

+++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json

@@ -1098,6 +1098,27 @@

"name": "[trigger] save ui_touch_selection_unittests"

{

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "AndroidWebViewTest"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_2"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "AndroidWebViewTest.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

"cmd": [

"[SLAVE_BUILD]/src/build/android/adb_install_apk.py",

"[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",

@@ -1110,7 +1131,10 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "install AndroidWebView.apk"

+ "name": "AndroidWebViewTest.install AndroidWebView.apk",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1134,9 +1158,46 @@

"/path/to/tmp/json"

"cwd": "[SLAVE_BUILD]",

- "name": "Instrumentation test AndroidWebViewTest",

+ "name": "AndroidWebViewTest.Instrumentation test AndroidWebViewTest",

"~followup_annotations": [

- "@@@STEP_TEXT@ failures: TestB @@@"

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_2"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "AndroidWebViewTest.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ContentShellTest"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_3"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "ContentShellTest.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

]

{

@@ -1152,7 +1213,10 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "install ContentShell.apk"

+ "name": "ContentShellTest.install ContentShell.apk",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1176,9 +1240,46 @@

"/path/to/tmp/json"

"cwd": "[SLAVE_BUILD]",

- "name": "Instrumentation test ContentShellTest",

+ "name": "ContentShellTest.Instrumentation test ContentShellTest",

"~followup_annotations": [

- "@@@STEP_TEXT@ failures: TestB @@@"

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_3"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ContentShellTest.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ChromePublicTest"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_4"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "ChromePublicTest.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

]

{

@@ -1194,7 +1295,10 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "install ChromePublic.apk"

+ "name": "ChromePublicTest.install ChromePublic.apk",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1218,9 +1322,46 @@

"/path/to/tmp/json"

"cwd": "[SLAVE_BUILD]",

- "name": "Instrumentation test ChromePublicTest",

+ "name": "ChromePublicTest.Instrumentation test ChromePublicTest",

"~followup_annotations": [

- "@@@STEP_TEXT@ failures: TestB @@@"

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_4"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ChromePublicTest.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ChromeSyncShellTest"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_5"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "ChromeSyncShellTest.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

]

{

@@ -1236,7 +1377,10 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "install ChromeSyncShell.apk"

+ "name": "ChromeSyncShellTest.install ChromeSyncShell.apk",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1258,9 +1402,46 @@

"/path/to/tmp/json"

"cwd": "[SLAVE_BUILD]",

- "name": "Instrumentation test ChromeSyncShellTest",

+ "name": "ChromeSyncShellTest.Instrumentation test ChromeSyncShellTest",

"~followup_annotations": [

- "@@@STEP_TEXT@ failures: TestB @@@"

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_5"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ChromeSyncShellTest.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "breakpad_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_6"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "breakpad_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

]

{

@@ -1284,7 +1465,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "breakpad_unittests"

+ "name": "breakpad_unittests.breakpad_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_6"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "breakpad_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "cc_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_7"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "cc_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1306,7 +1527,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "cc_unittests"

+ "name": "cc_unittests.cc_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_7"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "cc_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "content_browsertests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_8"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "content_browsertests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1328,7 +1589,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "content_browsertests"

+ "name": "content_browsertests.content_browsertests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_8"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "content_browsertests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "content_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_9"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "content_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1350,7 +1651,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "content_unittests"

+ "name": "content_unittests.content_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_9"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "content_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "gpu_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_10"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "gpu_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1372,7 +1713,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "gpu_unittests"

+ "name": "gpu_unittests.gpu_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_10"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "gpu_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "media_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_11"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "media_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1394,7 +1775,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "media_unittests"

+ "name": "media_unittests.media_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_11"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "media_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "net_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_12"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "net_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1419,7 +1840,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "net_unittests"

+ "name": "net_unittests.net_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_12"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "net_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "sandbox_linux_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_13"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "sandbox_linux_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1441,7 +1902,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "sandbox_linux_unittests"

+ "name": "sandbox_linux_unittests.sandbox_linux_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_13"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "sandbox_linux_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ui_base_unittests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_14"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "ui_base_unittests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1463,7 +1964,47 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "ui_base_unittests"

+ "name": "ui_base_unittests.ui_base_unittests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_14"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "ui_base_unittests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "unit_tests"

+ },

+ {

+ "cmd": [

+ "[BUILD]/scripts/slave/daemonizer.py",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

+ "[TMP_BASE]/test_logcat_tmp_15"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "unit_tests.spawn_logcat_monitor",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1485,7 +2026,26 @@

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "unit_tests"

+ "name": "unit_tests.unit_tests",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/tee.py",

+ "/path/to/tmp/logcat",

+ "--",

+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[TMP_BASE]/test_logcat_tmp_15"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "name": "unit_tests.logcat_dump",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@"

+ ]

{

"cmd": [

@@ -1606,7 +2166,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -1673,7 +2233,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -1742,7 +2302,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -1807,7 +2367,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -1872,7 +2432,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -1937,7 +2497,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -2004,7 +2564,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -2071,7 +2631,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -2136,7 +2696,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",

@@ -2201,7 +2761,7 @@

"--collect",

"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",

"--results-path",

- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",

+ "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",

"--verbose",

"--json-results-file",

"/path/to/tmp/json",