| Index: scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json b/scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json
|
| index 8bba261267081ca15994259b23f06d7a89681aa7..71df76c8eca8f62037ab994d52b274a9fe955c7c 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json
|
| @@ -47,7 +47,6 @@
|
| "--spec",
|
| "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -68,7 +67,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -138,7 +136,6 @@
|
| "-u",
|
| "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\nprint json.dumps({'ccache': ccache})\n"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -208,7 +205,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -225,7 +221,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -245,7 +240,6 @@
|
| "echo",
|
| "$EXTERNAL_STORAGE"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -261,7 +255,6 @@
|
| "015d210a13480604",
|
| "root"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -274,7 +267,6 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -288,7 +280,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -305,7 +296,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -323,7 +313,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -342,7 +331,6 @@
|
| "shell",
|
| "stop"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -359,7 +347,6 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -376,7 +363,6 @@
|
| "[SLAVE_BUILD]/skia/resources",
|
| "/storage/emulated/legacy/skiabot/skia_resources"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -395,7 +381,6 @@
|
| "[SLAVE_BUILD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -418,7 +403,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -429,7 +413,6 @@
|
| "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| @@ -439,7 +422,6 @@
|
| "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "remove actual SKP_VERSION",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -456,7 +438,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]/playback/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree skps",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -477,7 +458,6 @@
|
| "[SLAVE_BUILD]/playback/skps",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs skps",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -505,7 +485,6 @@
|
| "gs://chromium-skia-gm/playback_42/skps/*",
|
| "[SLAVE_BUILD]/playback/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
|
| @@ -520,7 +499,6 @@
|
| "42",
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "write SKP_VERSION"
|
| },
|
| {
|
| @@ -532,7 +510,6 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -551,7 +528,6 @@
|
| "-f",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -569,7 +545,6 @@
|
| "-r",
|
| "/storage/emulated/legacy/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -593,7 +568,6 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -612,7 +586,6 @@
|
| "-p",
|
| "/storage/emulated/legacy/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -629,7 +602,6 @@
|
| "[SLAVE_BUILD]/playback/skps",
|
| "/storage/emulated/legacy/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -649,7 +621,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -665,7 +636,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -676,7 +646,6 @@
|
| "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -688,7 +657,6 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -704,7 +672,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]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -725,7 +692,6 @@
|
| "[SLAVE_BUILD]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -750,7 +716,6 @@
|
| "-r",
|
| "/storage/emulated/legacy/skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -774,7 +739,6 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -793,7 +757,6 @@
|
| "-p",
|
| "/storage/emulated/legacy/skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -858,7 +821,6 @@
|
| "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -917,7 +879,6 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -937,7 +898,6 @@
|
| "/storage/emulated/legacy/skiabot/skia_dm",
|
| "[SLAVE_BUILD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -992,7 +952,6 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -1012,7 +971,6 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -1027,7 +985,6 @@
|
| "015d210a13480604",
|
| "reboot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -1040,7 +997,6 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -1054,7 +1010,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -1071,7 +1026,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
|
|