| Index: scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json b/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| index 1efd5d8b8f7cefe224f8cef62637cd2a44f3e6c8..a2bed4e9a42c155efac64ac609e41c44c78f8edb 100644
|
| --- a/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| +++ b/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| @@ -49,7 +49,6 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -66,7 +65,6 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -86,7 +84,6 @@
|
| "echo",
|
| "$EXTERNAL_STORAGE"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -102,7 +99,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -122,7 +118,6 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -139,7 +134,6 @@
|
| "[SLAVE_BUILD]/skia/resources",
|
| "/storage/emulated/legacy/skiabot/skia_resources"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -160,7 +154,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -170,7 +163,6 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -189,7 +181,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -199,7 +190,6 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -217,7 +207,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",
|
| "[SWARM_OUT_DIR]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PYTHONPATH": "build/scripts"
|
| },
|
| @@ -241,7 +230,6 @@
|
| "[SWARM_OUT_DIR]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -264,7 +252,6 @@
|
| "-r",
|
| "/storage/emulated/legacy/skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -288,7 +275,6 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -307,7 +293,6 @@
|
| "-p",
|
| "/storage/emulated/legacy/skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -325,7 +310,6 @@
|
| "[SLAVE_BUILD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -397,7 +381,6 @@
|
| "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -456,7 +439,6 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -476,7 +458,6 @@
|
| "/storage/emulated/legacy/skiabot/skia_dm",
|
| "[SWARM_OUT_DIR]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -496,7 +477,6 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -511,7 +491,6 @@
|
| "/b/android-sdk-linux/platform-tools/adb",
|
| "reboot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -526,7 +505,6 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| @@ -540,7 +518,6 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
| @@ -557,7 +534,6 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/b/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
|
|
|