| Index: scripts/slave/recipes/skia/skia.expected/failed_get_hashes.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/failed_get_hashes.json b/scripts/slave/recipes/skia/skia.expected/failed_get_hashes.json
|
| index f344473032d3e09275fa00118136fabf830bfd31..8b2e15af0932e918f766d4b270decec9c2aeefb7 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/failed_get_hashes.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/failed_get_hashes.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"
|
| },
|
| {
|
| @@ -441,7 +424,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",
|
| @@ -458,7 +440,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -469,7 +450,6 @@
|
| "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -481,7 +461,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",
|
| @@ -497,7 +476,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@@@@",
|
| @@ -518,7 +496,6 @@
|
| "[SLAVE_BUILD]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -543,7 +520,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",
|
| @@ -567,7 +543,6 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -586,7 +561,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",
|
| @@ -653,7 +627,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",
|
| @@ -712,7 +685,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",
|
| @@ -732,7 +704,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",
|
| @@ -787,7 +758,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",
|
| @@ -807,7 +777,6 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -822,7 +791,6 @@
|
| "015d210a13480604",
|
| "reboot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -835,7 +803,6 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| @@ -849,7 +816,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| @@ -866,7 +832,6 @@
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
|
|