| Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__amp_split_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__amp_split_.json
|
| similarity index 75%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__amp_split_.json
|
| index e83cffac10fee9f46196e340d59aab02b94736bc..781ed2fd3fc9b8b3bb8affbb3d869b35a920e24b 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__amp_split_.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "chromium.linux",
|
| "--builder",
|
| - "Android Tests",
|
| + "Android Tests (amp split)",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -102,7 +102,7 @@
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Android Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Android Tests (amp split)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -182,9 +182,9 @@
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Tests (amp split)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Tests (amp split)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| "name": "extract build"
|
| },
|
| @@ -449,44 +449,6 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "android_webview_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "android_webview_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "base_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "base_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| "breakpad_unittests",
|
| "--verbose",
|
| "--release",
|
| @@ -526,25 +488,6 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "components_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "components_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| "content_browsertests",
|
| "--verbose",
|
| "--release",
|
| @@ -583,44 +526,6 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "events_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "events_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "gl_tests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "gl_tests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| "gpu_unittests",
|
| "--verbose",
|
| "--release",
|
| @@ -640,25 +545,6 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "ipc_tests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "ipc_tests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| "media_unittests",
|
| "--verbose",
|
| "--release",
|
| @@ -716,63 +602,6 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "sql_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "sql_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "sync_unit_tests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "sync_unit_tests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "ui_android_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "ui_android_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| "ui_base_unittests",
|
| "--verbose",
|
| "--release",
|
| @@ -792,25 +621,6 @@
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| - "ui_touch_selection_unittests",
|
| - "--verbose",
|
| - "--release",
|
| - "--flakiness-dashboard-server=http://test-results.appspot.com",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "ui_touch_selection_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| "unit_tests",
|
| "--verbose",
|
| "--release",
|
| @@ -827,69 +637,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "junit",
|
| - "-s",
|
| - "junit_unit_tests",
|
| - "--verbose",
|
| - "--release",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "junit_unit_tests",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "junit",
|
| - "-s",
|
| - "chrome_junit_tests",
|
| - "--verbose",
|
| - "--release",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "chrome_junit_tests",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "junit",
|
| - "-s",
|
| - "content_junit_tests",
|
| - "--verbose",
|
| - "--release",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "content_junit_tests",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| @@ -909,11 +656,11 @@
|
| "--",
|
| "cp",
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| - "gs://chromium-android/logcat_dumps/Android Tests/571"
|
| + "gs://chromium-android/logcat_dumps/Android Tests (amp split)/571"
|
| ],
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests/571@@@"
|
| + "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests (amp split)/571@@@"
|
| ]
|
| },
|
| {
|
|
|