| Index: scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus6_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus6_.json b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus6_.json
|
| index 66033c4a8193b888ba9695a60c18e017cf777948..7aff76432895bd60c4c98bd79aa0e759e76326c0 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus6_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus6_.json
|
| @@ -29,7 +29,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -121,7 +120,6 @@
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -136,7 +134,6 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.install cipd",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -161,7 +158,6 @@
|
| "--service-account-json",
|
| "/creds/service_accounts/service-account-goma-client.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.ensure_installed",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -183,7 +179,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CROSSCOMPILE": "1",
|
| @@ -207,7 +202,6 @@
|
| "--properties",
|
| "{\"buildername\": \"Android Tests (dbg) (L Nexus6)\", \"buildnumber\": 571, \"mastername\": \"chromium.webrtc.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -222,7 +216,6 @@
|
| "[SLAVE_BUILD]/src/testing/buildbot/chromium.webrtc.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webrtc.fyi.json@@@",
|
| @@ -239,7 +232,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -252,7 +244,6 @@
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -277,7 +268,6 @@
|
| "[SLAVE_BUILD]/src",
|
| "src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tree truth steps"
|
| },
|
| {
|
| @@ -287,7 +277,6 @@
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| "[SLAVE_BUILD]/src/out/Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -317,7 +306,6 @@
|
| "--build-number",
|
| "571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "extract build"
|
| },
|
| {
|
| @@ -328,7 +316,6 @@
|
| "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "List adb devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -345,7 +332,6 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "014E1F310401C009"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Root devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -369,7 +355,6 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "create adb symlink"
|
| },
|
| {
|
| @@ -379,7 +364,6 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| @@ -395,7 +379,6 @@
|
| "--adb-path",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| @@ -412,7 +395,6 @@
|
| "--known-devices-file",
|
| "[BUILD]/site_config/.known_devices"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| @@ -525,7 +507,6 @@
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| @@ -550,7 +531,6 @@
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| @@ -567,7 +547,6 @@
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| @@ -584,7 +563,6 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| @@ -596,7 +574,6 @@
|
| "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -615,7 +592,6 @@
|
| "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| "gs://chromium-android/logcat_dumps/Android Tests (dbg) (L Nexus6)/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests (dbg) (L Nexus6)/571@@@"
|
| @@ -629,7 +605,6 @@
|
| "--more-info",
|
| "[SLAVE_BUILD]/src/out/Debug/full_log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -644,7 +619,6 @@
|
| "-s",
|
| "-w"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -659,7 +633,6 @@
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|