Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json |
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json |
similarity index 85% |
copy from infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json |
copy to infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json |
index 0bda003de1f5e48323ecb35d7fa451a006b64e4f..3ef0410b20f8c61da9bb777321a007b9d836035a 100644 |
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json |
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json |
@@ -35,7 +35,7 @@ |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", |
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" |
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" |
}, |
"name": "gclient setup" |
}, |
@@ -59,7 +59,7 @@ |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", |
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" |
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" |
}, |
"name": "gclient sync", |
"~followup_annotations": [ |
@@ -88,8 +88,8 @@ |
"cmd": [ |
"gn", |
"gen", |
- "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug", |
- "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_ldflags=\"-fuse-ld=lld\"" |
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug", |
+ "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_ldflags=\"-fuse-ld=lld\" sanitize=\"ASAN\"" |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
"env": { |
@@ -101,7 +101,7 @@ |
"cmd": [ |
"ninja", |
"-C", |
- "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug" |
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug" |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
"env": { |
@@ -111,10 +111,45 @@ |
}, |
{ |
"cmd": [ |
+ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" |
+ ], |
+ "cwd": "[CUSTOM_/_B_WORK]/skia", |
+ "env": { |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "fetch-gn (2)" |
+ }, |
+ { |
+ "cmd": [ |
+ "gn", |
+ "gen", |
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug", |
+ "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_ldflags=\"-fuse-ld=lld\" sanitize=\"ASAN\"" |
+ ], |
+ "cwd": "[CUSTOM_/_B_WORK]/skia", |
+ "env": { |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "gn gen (2)" |
+ }, |
+ { |
+ "cmd": [ |
+ "ninja", |
+ "-C", |
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug" |
+ ], |
+ "cwd": "[CUSTOM_/_B_WORK]/skia", |
+ "env": { |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "ninja (2)" |
+ }, |
+ { |
+ "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 = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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", |
- "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug", |
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug", |
"[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" |
], |
"name": "copy build products", |