| Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
|
| index 2c90411495458f28f5fa70b76cede25a6f6ff927..7d38325c25e7265d20719938a0dc36b5d14dd2c9 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
|
| @@ -352,7 +352,7 @@
|
| "[BUILD]/scripts/slave/daemonizer.py",
|
| "--",
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[SLAVE_BUILD]/src/out/logcat_dir"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| @@ -642,6 +642,27 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "android_webview_unittests"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[BUILD]/scripts/slave/daemonizer.py",
|
| + "--",
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| + "[TMP_BASE]/logcat_tmp_1"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "android_webview_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -661,7 +682,47 @@
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "android_webview_unittests"
|
| + "name": "android_webview_unittests.android_webview_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_1"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "android_webview_unittests.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_2"
|
| + ],
|
| + "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": [
|
| @@ -684,7 +745,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]/logcat_tmp_2"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "content_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "device_unittests"
|
| + },
|
| + {
|
| + "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": "device_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -706,7 +807,483 @@
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "device_unittests"
|
| + "name": "device_unittests.device_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_3"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "device_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "events_unittests"
|
| + },
|
| + {
|
| + "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": "events_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "events_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": "events_unittests.events_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_4"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "events_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "gl_tests"
|
| + },
|
| + {
|
| + "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": "gl_tests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "gl_tests",
|
| + "--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": "gl_tests.gl_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_5"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "gl_tests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "gl_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": "gl_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "gl_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": "gl_unittests.gl_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": "gl_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_7"
|
| + ],
|
| + "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": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "gpu_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": "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_7"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "gpu_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "ipc_tests"
|
| + },
|
| + {
|
| + "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": "ipc_tests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "ipc_tests",
|
| + "--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": "ipc_tests.ipc_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_8"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "ipc_tests.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_9"
|
| + ],
|
| + "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": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "media_unittests",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--verbose",
|
| + "--release",
|
| + "--isolate_file_path=[SLAVE_BUILD]/src/media/media_unittests.isolate",
|
| + "--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": "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_9"
|
| + ],
|
| + "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_10"
|
| + ],
|
| + "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": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "net_unittests",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--verbose",
|
| + "--release",
|
| + "--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate",
|
| + "--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": "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_10"
|
| + ],
|
| + "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_11"
|
| + ],
|
| + "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": [
|
| @@ -715,7 +1292,7 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "events_unittests",
|
| + "sandbox_linux_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -728,51 +1305,47 @@
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "events_unittests"
|
| + "name": "sandbox_linux_unittests.sandbox_linux_unittests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "gl_tests",
|
| - "--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"
|
| + "[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]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "gl_tests"
|
| + "name": "sandbox_linux_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "sql_unittests"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "gl_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"
|
| + "[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": "gl_unittests"
|
| + "name": "sql_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -781,11 +1354,12 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "gpu_unittests",
|
| + "sql_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| "--release",
|
| + "--isolate_file_path=[SLAVE_BUILD]/src/sql/sql_unittests.isolate",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| @@ -794,29 +1368,47 @@
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "gpu_unittests"
|
| + "name": "sql_unittests.sql_unittests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "ipc_tests",
|
| - "--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"
|
| + "[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": "sql_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "sync_unit_tests"
|
| + },
|
| + {
|
| + "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": "ipc_tests"
|
| + "name": "sync_unit_tests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -825,12 +1417,12 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "media_unittests",
|
| + "sync_unit_tests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| "--release",
|
| - "--isolate_file_path=[SLAVE_BUILD]/src/media/media_unittests.isolate",
|
| + "--isolate_file_path=[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| @@ -839,30 +1431,47 @@
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "media_unittests"
|
| + "name": "sync_unit_tests.sync_unit_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "net_unittests",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--verbose",
|
| - "--release",
|
| - "--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate",
|
| - "--flakiness-dashboard-server=test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| + "[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": "sync_unit_tests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "ui_android_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": "net_unittests"
|
| + "name": "ui_android_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -871,7 +1480,7 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "sandbox_linux_unittests",
|
| + "ui_android_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -884,30 +1493,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": "ui_android_unittests.ui_android_unittests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "sql_unittests",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--verbose",
|
| - "--release",
|
| - "--isolate_file_path=[SLAVE_BUILD]/src/sql/sql_unittests.isolate",
|
| - "--flakiness-dashboard-server=test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| + "[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_android_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_15"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "sql_unittests"
|
| + "name": "ui_base_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -916,12 +1542,12 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "sync_unit_tests",
|
| + "ui_base_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| "--release",
|
| - "--isolate_file_path=[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate",
|
| + "--isolate_file_path=[SLAVE_BUILD]/src/ui/base/ui_base_tests.isolate",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| @@ -930,29 +1556,47 @@
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "sync_unit_tests"
|
| + "name": "ui_base_unittests.ui_base_unittests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "ui_android_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"
|
| + "[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": "ui_base_unittests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "ui_touch_selection_unittests"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[BUILD]/scripts/slave/daemonizer.py",
|
| + "--",
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| + "[TMP_BASE]/logcat_tmp_16"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "ui_android_unittests"
|
| + "name": "ui_touch_selection_unittests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -961,12 +1605,11 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "ui_base_unittests",
|
| + "ui_touch_selection_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| "--release",
|
| - "--isolate_file_path=[SLAVE_BUILD]/src/ui/base/ui_base_tests.isolate",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| @@ -975,29 +1618,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_touch_selection_unittests.ui_touch_selection_unittests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "ui_touch_selection_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"
|
| + "[BUILD]/scripts/slave/tee.py",
|
| + "/path/to/tmp/logcat",
|
| + "--",
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| + "[TMP_BASE]/logcat_tmp_16"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "ui_touch_selection_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_17"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "ui_touch_selection_unittests"
|
| + "name": "unit_tests.spawn_logcat_monitor",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -1020,7 +1681,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]/logcat_tmp_17"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "unit_tests.logcat_dump",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -1162,7 +1842,7 @@
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| "--",
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[SLAVE_BUILD]/src/out/logcat_dir"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
|
|