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

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

Issue 1511403002: Revert "[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 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
Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json
diff --git a/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json
index 2184d1a7d5a0482b7eef9242570b07f558f1c91f..395dbbeb078290f7458fa9d4595f54d9192bc8cb 100644
--- a/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json
+++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_local_failure.json
@@ -269,7 +269,7 @@
"[BUILD]/scripts/slave/daemonizer.py",
"--",
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
- "[SLAVE_BUILD]/src/out/logcat_dir"
+ "[SLAVE_BUILD]/src/out/logcat"
],
"cwd": "[SLAVE_BUILD]",
"env": {
@@ -1077,27 +1077,6 @@
"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]/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,10 +1089,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "AndroidWebViewTest.install AndroidWebView.apk",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install AndroidWebView.apk"
},
{
"cmd": [
@@ -1137,46 +1113,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "AndroidWebViewTest.Instrumentation test AndroidWebViewTest",
+ "name": "Instrumentation test AndroidWebViewTest",
"~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]/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]/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@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -1192,10 +1131,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "ContentShellTest.install ContentShell.apk",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install ContentShell.apk"
},
{
"cmd": [
@@ -1219,46 +1155,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ContentShellTest.Instrumentation test ContentShellTest",
- "~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]/logcat_tmp_3"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ContentShellTest.logcat_dump",
+ "name": "Instrumentation test ContentShellTest",
"~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]/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@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -1274,10 +1173,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "ChromePublicTest.install ChromePublic.apk",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install ChromePublic.apk"
},
{
"cmd": [
@@ -1301,46 +1197,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromePublicTest.Instrumentation test ChromePublicTest",
+ "name": "Instrumentation test ChromePublicTest",
"~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]/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]/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@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
@@ -1356,10 +1215,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "ChromeSyncShellTest.install ChromeSyncShell.apk",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "install ChromeSyncShell.apk"
},
{
"cmd": [
@@ -1381,55 +1237,35 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest.Instrumentation test ChromeSyncShellTest",
+ "name": "Instrumentation test ChromeSyncShellTest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/tee.py",
- "/path/to/tmp/logcat",
- "--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
- "[TMP_BASE]/logcat_tmp_5"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "ChromeSyncShellTest.logcat_dump",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "base_unittests",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "breakpad_unittests"
- },
- {
- "cmd": [
- "[BUILD]/scripts/slave/daemonizer.py",
- "--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
- "[TMP_BASE]/logcat_tmp_6"
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "base_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose",
+ "--release",
+ "--flakiness-dashboard-server=test-results.appspot.com",
+ "--json-results-file",
+ "/path/to/tmp/json"
],
"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",
+ "name": "base_unittests",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "step returned non-zero exit code: 1",
+ "@@@STEP_FAILURE@@@"
]
},
{
@@ -1453,47 +1289,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "breakpad_unittests"
},
{
"cmd": [
@@ -1515,47 +1311,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "cc_unittests"
},
{
"cmd": [
@@ -1577,47 +1333,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "content_browsertests"
},
{
"cmd": [
@@ -1639,47 +1355,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "content_unittests"
},
{
"cmd": [
@@ -1701,47 +1377,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "gpu_unittests"
},
{
"cmd": [
@@ -1763,47 +1399,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "media_unittests"
},
{
"cmd": [
@@ -1828,47 +1424,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "net_unittests"
},
{
"cmd": [
@@ -1890,47 +1446,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "sandbox_linux_unittests"
},
{
"cmd": [
@@ -1952,47 +1468,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/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]/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@@@"
- ]
+ "name": "ui_base_unittests"
},
{
"cmd": [
@@ -2014,26 +1490,7 @@
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "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]/logcat_tmp_15"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "unit_tests.logcat_dump",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "name": "unit_tests"
},
{
"cmd": [
@@ -2154,7 +1611,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2221,7 +1678,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2286,7 +1743,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2351,7 +1808,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2416,7 +1873,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2483,7 +1940,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2550,7 +2007,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2615,7 +2072,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2680,7 +2137,7 @@
"--collect",
"[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
@@ -2713,7 +2170,7 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"--",
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
- "[SLAVE_BUILD]/src/out/logcat_dir"
+ "[SLAVE_BUILD]/src/out/logcat"
],
"cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"

Powered by Google App Engine
This is Rietveld 408576698