[infra] Ensure Mac xSAN backfill tasks can find Xcode.

This CL prepares for installing Xcode in a Swarming cache dir from a
CIPD package. https://skia-review.googlesource.com/c/skia/+/144608

After that, I hope to isolate the xSAN libs in the Build task so that
we don't need Xcode on the xSAN test bots. Baby steps.

Change-Id: I61dbe9474eceff42cbfd824c429db382b68a8c35
Reviewed-on: https://skia-review.googlesource.com/145143
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2018-08-02 10:49:10 -04:00 committed by Skia Commit-Bot
parent dfec99f835
commit e0e41efe44
2 changed files with 14 additions and 0 deletions

View File

@ -206,6 +206,11 @@ class DefaultFlavor(object):
ld_library_path.append(clang_linux + '/msan')
if any('SAN' in t for t in extra_tokens):
if self.m.vars.builder_cfg.get('os', '') == 'Mac':
# TODO(dogben): Remove after isolating xSAN libraries in Build tasks.
self.m.step('select xcode', [
'sudo', 'xcode-select', '-switch', '/Applications/Xcode9.2.app'])
# Sanitized binaries may want to run clang_linux/bin/llvm-symbolizer.
path.append(clang_linux + '/bin')
# We find that testing sanitizer builds with libc++ uncovers more issues

View File

@ -139,6 +139,15 @@
"infra_step": true,
"name": "write SVG_VERSION"
},
{
"cmd": [
"sudo",
"xcode-select",
"-switch",
"/Applications/Xcode9.2.app"
],
"name": "select xcode"
},
{
"cmd": [
"[START_DIR]/build/dm",