| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| index 3ebf941c62518030ae29d868b3b03d77c1f249b3..7f46d43828b31515864a905ea440e92617e84177 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.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": {
|
| @@ -1098,27 +1098,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",
|
| @@ -1131,10 +1110,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": [
|
| @@ -1158,46 +1134,9 @@
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "AndroidWebViewTest.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",
|
| + "name": "Instrumentation test AndroidWebViewTest",
|
| "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@"
|
| + "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| ]
|
| },
|
| {
|
| @@ -1213,10 +1152,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": [
|
| @@ -1240,46 +1176,9 @@
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "ContentShellTest.Instrumentation test ContentShellTest",
|
| + "name": "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",
|
| - "~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/>@@@"
|
| ]
|
| },
|
| {
|
| @@ -1295,10 +1194,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": [
|
| @@ -1322,46 +1218,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/>@@@"
|
| ]
|
| },
|
| {
|
| @@ -1377,10 +1236,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": [
|
| @@ -1402,46 +1258,9 @@
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "ChromeSyncShellTest.Instrumentation test ChromeSyncShellTest",
|
| + "name": "Instrumentation test ChromeSyncShellTest",
|
| "~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_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]/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@@@"
|
| + "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| ]
|
| },
|
| {
|
| @@ -1465,47 +1284,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": [
|
| @@ -1527,47 +1306,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": [
|
| @@ -1589,47 +1328,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": [
|
| @@ -1651,47 +1350,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": [
|
| @@ -1713,47 +1372,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": [
|
| @@ -1775,47 +1394,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": [
|
| @@ -1840,47 +1419,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": [
|
| @@ -1902,47 +1441,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": [
|
| @@ -1964,47 +1463,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": [
|
| @@ -2026,26 +1485,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": [
|
| @@ -2166,7 +1606,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",
|
| @@ -2233,7 +1673,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",
|
| @@ -2300,7 +1740,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",
|
| @@ -2365,7 +1805,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",
|
| @@ -2430,7 +1870,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",
|
| @@ -2495,7 +1935,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",
|
| @@ -2562,7 +2002,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",
|
| @@ -2629,7 +2069,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",
|
| @@ -2694,7 +2134,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",
|
| @@ -2759,7 +2199,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",
|
| @@ -2792,7 +2232,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"
|
|
|