| 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 740723a93c39ef3b30828181f397ebcb6580cf6b..61c6d6b9120d5aea3e7bfdcf1e85d3c06d85a03f 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
|
| @@ -1250,14 +1250,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "breakpad_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_breakpad_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| - "--release",
|
| "--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| @@ -1265,7 +1261,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "breakpad_unittests"
|
| @@ -1274,21 +1269,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "cc_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_cc_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "cc_unittests"
|
| @@ -1297,21 +1287,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "content_browsertests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_content_browsertests",
|
| "--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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "content_browsertests"
|
| @@ -1320,21 +1305,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "content_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_content_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "content_unittests"
|
| @@ -1343,21 +1323,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "gpu_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "gpu_unittests"
|
| @@ -1366,21 +1341,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "media_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_media_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "media_unittests"
|
| @@ -1389,14 +1359,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "net_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_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",
|
| @@ -1406,7 +1372,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "net_unittests"
|
| @@ -1415,21 +1380,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "sandbox_linux_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_sandbox_linux_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "sandbox_linux_unittests"
|
| @@ -1438,21 +1398,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "ui_base_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_ui_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "ui_base_unittests"
|
| @@ -1461,21 +1416,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "unit_tests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_unit_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": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "unit_tests"
|
|
|