| 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..818fe7a067bdf4330f8da8e21818f0d027c9e3d0 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
|
| @@ -7,7 +7,7 @@
|
| "origin",
|
| "https://skia.googlesource.com/skia.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git remote set-url"
|
| },
|
| {
|
| @@ -15,7 +15,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -25,7 +25,7 @@
|
| "--hard",
|
| "abc123"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git reset"
|
| },
|
| {
|
| @@ -35,7 +35,7 @@
|
| "-d",
|
| "-f"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -45,9 +45,8 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| + "cache_dir = '[ROOT]/b/build/slave/cache_dir'\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]"
|
| },
|
| @@ -89,11 +87,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| + "[CWD]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -134,45 +132,43 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_ninja"
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_ninja"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "build iOSShell"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install"
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_install"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "install iOSShell"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed",
|
| - "[SLAVE_BUILD]/skia/resources",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_push_if_needed",
|
| + "[CWD]/skia/resources",
|
| "skiabot/skia_resources"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "push resources to skia_resources"
|
| },
|
| @@ -181,10 +177,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/tmp",
|
| + "[CWD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -204,10 +199,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "[CWD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -215,114 +209,106 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| + "[CWD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_cat_file",
|
| "skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "read SKP_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "rm skiabot/skia_tmp_dir/SKP_VERSION"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "rmdir skiabot/skia_skp/skps"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| "skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "mkdir skiabot/skia_skp/skps"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed",
|
| - "[SLAVE_BUILD]/playback/skps",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_push_if_needed",
|
| + "[CWD]/playback/skps",
|
| "skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "push skps to skps"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_push_file",
|
| + "[CWD]/tmp/SKP_VERSION",
|
| "skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION"
|
| + "name": "push [CWD]/tmp/SKP_VERSION"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| + "[CWD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -330,113 +316,105 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| + "[CWD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file",
|
| + "[CWD]/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",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "read SK_IMAGE_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "rmdir skiabot/skia_images"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| "skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "mkdir skiabot/skia_images"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed",
|
| - "[SLAVE_BUILD]/images",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_push_if_needed",
|
| + "[CWD]/images",
|
| "skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "push images to skia_images"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file",
|
| - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_push_file",
|
| + "[CWD]/tmp/SK_IMAGE_VERSION",
|
| "skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
|
| + "name": "push [CWD]/tmp/SK_IMAGE_VERSION"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "\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]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -454,10 +432,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/dm",
|
| + "[CWD]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -474,31 +451,29 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_rm",
|
| "skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "rmdir skiabot/skia_dm"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_mkdir",
|
| "skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "mkdir skiabot/skia_dm"
|
| },
|
| @@ -507,15 +482,15 @@
|
| "python",
|
| "-u",
|
| "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
|
| - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt"
|
| + "[CWD]/tmp/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "get uninteresting hashes",
|
| "~followup_annotations": [
|
| @@ -554,23 +529,22 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file",
|
| - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_push_file",
|
| + "[CWD]/tmp/uninteresting_hashes.txt",
|
| "skiabot/skia_tmp_dir/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt"
|
| + "name": "push [CWD]/tmp/uninteresting_hashes.txt"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_run_skia",
|
| "--dm",
|
| "--undefok",
|
| "--resourcePath",
|
| @@ -611,29 +585,27 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "dm"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_pull_if_needed",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_pull_if_needed",
|
| "skiabot/skia_dm",
|
| - "[SLAVE_BUILD]/dm"
|
| + "[CWD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "pull skia_dm"
|
| },
|
| @@ -642,14 +614,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
|
| - "[SLAVE_BUILD]/dm",
|
| + "[CWD]/dm",
|
| "164710",
|
| "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug",
|
| "5",
|
| "",
|
| - "[SLAVE_BUILD]/skia/common/py/utils"
|
| + "[CWD]/skia/common/py/utils"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto",
|
| @@ -657,13 +629,13 @@
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "Upload DM Results"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia",
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_run_skia",
|
| "--nanobench",
|
| "--undefok",
|
| "-i",
|
| @@ -675,27 +647,25 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "nanobench"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart"
|
| + "[CWD]/skia/platform_tools/ios/bin/ios_restart"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "reboot"
|
| },
|
| @@ -704,13 +674,12 @@
|
| "sleep",
|
| "20"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CC": "/usr/bin/clang",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug"
|
| },
|
| "name": "wait for reboot"
|
| },
|
|
|