| Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
|
| index 32ceb0dc5d96b3fd30dc745a55841c45edcf51f1..234faf8ab0903f088d2dfde0270307ab9f700fb7 100644
|
| --- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
|
| +++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
|
| @@ -3,11 +3,84 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| + "\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",
|
| + "[CUSTOM_/_B_CACHE]",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout_path",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| + "config",
|
| + "--spec",
|
| + "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| + ],
|
| + "cwd": "[CUSTOM_/_B_CACHE]",
|
| + "env": {
|
| + "CHROME_HEADLESS": "1",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "PYTHONPATH": "[BUILD]/scripts"
|
| + },
|
| + "name": "gclient setup"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| + "sync",
|
| + "--nohooks",
|
| + "--force",
|
| + "--verbose",
|
| + "--delete_unversioned_trees",
|
| + "--revision",
|
| + "skia@abc123",
|
| + "--output-json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[CUSTOM_/_B_CACHE]",
|
| + "env": {
|
| + "CHROME_HEADLESS": "1",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "PYTHONPATH": "[BUILD]/scripts"
|
| + },
|
| + "name": "gclient sync",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[CUSTOM_/_B_CACHE]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| "Build-Mac-Clang-Arm7-Release-iOS"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CUSTOM_/_B_CACHE]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -47,15 +120,16 @@
|
| "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_ninja"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CUSTOM_/_B_CACHE]/skia",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CC": "/usr/bin/clang",
|
| "CHROME_HEADLESS": "1",
|
| "CXX": "/usr/bin/clang++",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| + "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Mac-Clang-Arm7-Release-iOS"
|
| },
|
| "name": "build iOSShell"
|
| },
|
| @@ -64,7 +138,7 @@
|
| "python",
|
| "-u",
|
| "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n print 'Copying build product %s to %s' % (f, dst)\n shutil.move(f, dst)\n",
|
| - "[SLAVE_BUILD]/out/Release",
|
| + "[CUSTOM_/_B_CACHE]/skia/out/Build-Mac-Clang-Arm7-Release-iOS/Release",
|
| "[SWARM_OUT_DIR]/out/Release"
|
| ],
|
| "name": "copy build products",
|
| @@ -98,7 +172,7 @@
|
| "python",
|
| "-u",
|
| "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n print 'Copying build product %s to %s' % (f, dst)\n shutil.move(f, dst)\n",
|
| - "[SLAVE_BUILD]/skia/xcodebuild/Release-iphoneos",
|
| + "[CUSTOM_/_B_CACHE]/skia/xcodebuild/Release-iphoneos",
|
| "[SWARM_OUT_DIR]/xcodebuild/Release-iphoneos"
|
| ],
|
| "name": "copy build products (2)",
|
|
|