forked from flutter/engine
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use XCode from CIPD. Include xSAN dylibs in Build task isolated output.
Change-Id: I0eb3dcc4d38eb2aeab22d1df1515e499cf21dc62 Reviewed-on: https://skia-review.googlesource.com/144608 Commit-Queue: Eric Boren <borenet@google.com> Auto-Submit: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com>
- Loading branch information
Showing
13 changed files
with
542 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
186 changes: 186 additions & 0 deletions
186
...a/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-ASAN.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| [ | ||
| { | ||
| "cmd": [], | ||
| "name": "ensure xcode", | ||
| "~followup_annotations": [ | ||
| "@@@STEP_TEXT@Ensuring Xcode version 9c40b in [START_DIR]/cache/Xcode.app@@@" | ||
| ] | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "[START_DIR]/mac_toolchain/mac_toolchain", | ||
| "install", | ||
| "-kind", | ||
| "ios", | ||
| "-xcode-version", | ||
| "9c40b", | ||
| "-output-dir", | ||
| "[START_DIR]/cache/Xcode.app" | ||
| ], | ||
| "name": "ensure xcode.install xcode", | ||
| "~followup_annotations": [ | ||
| "@@@STEP_NEST_LEVEL@1@@@" | ||
| ] | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "sudo", | ||
| "xcode-select", | ||
| "-switch", | ||
| "[START_DIR]/cache/Xcode.app" | ||
| ], | ||
| "name": "ensure xcode.select xcode", | ||
| "~followup_annotations": [ | ||
| "@@@STEP_NEST_LEVEL@1@@@" | ||
| ] | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "python", | ||
| "-u", | ||
| "[START_DIR]/cache/work/skia/bin/fetch-gn" | ||
| ], | ||
| "cwd": "[START_DIR]/cache/work/skia", | ||
| "env": { | ||
| "CHROME_HEADLESS": "1", | ||
| "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" | ||
| }, | ||
| "infra_step": true, | ||
| "name": "fetch-gn" | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "[START_DIR]/cache/work/skia/bin/gn", | ||
| "gen", | ||
| "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-ASAN/Debug", | ||
| "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=9c40b\", \"-O1\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\"" | ||
| ], | ||
| "cwd": "[START_DIR]/cache/work/skia", | ||
| "env": { | ||
| "CHROME_HEADLESS": "1", | ||
| "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" | ||
| }, | ||
| "name": "gn gen" | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "ninja", | ||
| "-k", | ||
| "0", | ||
| "-C", | ||
| "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-ASAN/Debug" | ||
| ], | ||
| "cwd": "[START_DIR]/cache/work/skia", | ||
| "env": { | ||
| "CHROME_HEADLESS": "1", | ||
| "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" | ||
| }, | ||
| "name": "ninja" | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "python", | ||
| "-u", | ||
| "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\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 dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", | ||
| "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-ASAN/Debug", | ||
| "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" | ||
| ], | ||
| "infra_step": true, | ||
| "name": "copy build products", | ||
| "~followup_annotations": [ | ||
| "@@@STEP_LOG_LINE@python.inline@import errno@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@import glob@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@import os@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@import shutil@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@import sys@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@try:@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ raise@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", | ||
| "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", | ||
| "@@@STEP_LOG_END@python.inline@@@" | ||
| ] | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "python", | ||
| "-u", | ||
| "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", | ||
| "--json-output", | ||
| "/path/to/tmp/json", | ||
| "glob", | ||
| "[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin", | ||
| "libclang_rt.*san_osx_dynamic.dylib" | ||
| ], | ||
| "infra_step": true, | ||
| "name": "find xSAN dylibs", | ||
| "stdout": "/path/to/tmp/", | ||
| "~followup_annotations": [ | ||
| "@@@STEP_LOG_LINE@glob@[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib@@@", | ||
| "@@@STEP_LOG_LINE@glob@[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin/libclang_rt.tsan_osx_dynamic.dylib@@@", | ||
| "@@@STEP_LOG_LINE@glob@[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin/libclang_rt.ubsan_osx_dynamic.dylib@@@", | ||
| "@@@STEP_LOG_END@glob@@@" | ||
| ] | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "python", | ||
| "-u", | ||
| "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", | ||
| "--json-output", | ||
| "/path/to/tmp/json", | ||
| "copy", | ||
| "[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib", | ||
| "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" | ||
| ], | ||
| "infra_step": true, | ||
| "name": "copy libclang_rt.asan_osx_dynamic.dylib" | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "python", | ||
| "-u", | ||
| "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", | ||
| "--json-output", | ||
| "/path/to/tmp/json", | ||
| "copy", | ||
| "[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin/libclang_rt.tsan_osx_dynamic.dylib", | ||
| "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" | ||
| ], | ||
| "infra_step": true, | ||
| "name": "copy libclang_rt.tsan_osx_dynamic.dylib" | ||
| }, | ||
| { | ||
| "cmd": [ | ||
| "python", | ||
| "-u", | ||
| "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", | ||
| "--json-output", | ||
| "/path/to/tmp/json", | ||
| "copy", | ||
| "[START_DIR]/cache/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/lib/darwin/libclang_rt.ubsan_osx_dynamic.dylib", | ||
| "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" | ||
| ], | ||
| "infra_step": true, | ||
| "name": "copy libclang_rt.ubsan_osx_dynamic.dylib" | ||
| }, | ||
| { | ||
| "name": "$result", | ||
| "recipe_result": null, | ||
| "status_code": 0 | ||
| } | ||
| ] |
Oops, something went wrong.