| Index: scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
|
| index e063d72e7a67a14b7f9c9435e18fb7afbe36ef52..ebdfc8542a73e3fdd45c1d1e897061b349b4f16a 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.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]"
|
| },
|
| @@ -150,7 +148,6 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -166,7 +163,6 @@
|
| "[SLAVE_BUILD]/skia/resources",
|
| "skiabot/skia_resources"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -184,7 +180,6 @@
|
| "[SLAVE_BUILD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -207,7 +202,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -218,7 +212,6 @@
|
| "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| @@ -226,7 +219,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file",
|
| "skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -242,7 +234,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -257,7 +248,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -272,7 +262,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| "skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -288,7 +277,6 @@
|
| "[SLAVE_BUILD]/playback/skps",
|
| "skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -304,7 +292,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -322,7 +309,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -333,7 +319,6 @@
|
| "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -341,7 +326,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file",
|
| "skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -357,7 +341,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -372,7 +355,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -387,7 +369,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| "skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -403,7 +384,6 @@
|
| "[SLAVE_BUILD]/images",
|
| "skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -419,7 +399,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -436,7 +415,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@@@@",
|
| @@ -457,7 +435,6 @@
|
| "[SLAVE_BUILD]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -477,7 +454,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -492,7 +468,6 @@
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| "skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -558,7 +533,6 @@
|
| "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
|
| "skiabot/skia_tmp_dir/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -611,7 +585,6 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -627,7 +600,6 @@
|
| "skiabot/skia_dm",
|
| "[SLAVE_BUILD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -675,7 +647,6 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -689,7 +660,6 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| @@ -704,7 +674,6 @@
|
| "sleep",
|
| "20"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
|
|