diff options
3 files changed, 1 insertions, 75 deletions
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index a380c6b3c1..5e6ac27eb5 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -111,41 +111,6 @@ }, { "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", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 72ff9928df..d4d39919a5 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -111,41 +111,6 @@ }, { "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-GCC-x86_64-Debug-MSAN/Debug", - "--args=cc=\"gcc\" cxx=\"g++\" extra_ldflags=\"-L[SLAVE_BUILD]/clang_linux/msan\" sanitize=\"MSAN\" skia_use_fontconfig=false" - ], - "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-GCC-x86_64-Debug-MSAN/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", diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py index 8c0908486c..022b0cd9ac 100644 --- a/infra/bots/recipes/swarm_compile.py +++ b/infra/bots/recipes/swarm_compile.py @@ -61,11 +61,7 @@ def build_targets_from_builder_dict(builder_dict): """Return a list of targets to build, depending on the builder type.""" if builder_dict.get('extra_config') == 'iOS': return ['iOSShell'] - if 'SAN' in builder_dict.get('extra_config', ''): - # 'most' does not compile under MSAN. - return ['dm', 'nanobench'] - else: - return ['most'] + return ['most'] def get_extra_env_vars(builder_dict): |