Reland: Make clusterfuzz_archive include llvm-symbolizer and sancov.

scripts/slave/recipe_modules/archive/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 import sys
 
 import manual_bisect_files
 from recipe_engine import recipe_api
 
@@ skipping 252 matching lines @@
     cp_branch, cp_number = self.m.commit_position.parse(commit_position)
     build_git_commit = self._get_git_commit(update_properties, primary_project)
 
     if fixed_staging_dir:
       staging_dir = self.m.path['slave_build'].join('chrome_staging')
       self.m.file.rmtree('purge staging dir', staging_dir)
       self.m.file.makedirs('create staging dir', staging_dir)
     else:
       staging_dir = self.m.path.mkdtemp('chrome_staging')
 
+    llvm_tools_to_copy = ['llvm-symbolizer', 'sancov']
+    llvm_bin_dir = self.m.path['checkout'].join('third_party', 'llvm-build',
+                                                'Release+Asserts', 'bin')
+    ext = '.exe' if self.m.platform.is_win else ''
+
+    for tool in llvm_tools_to_copy:
+      tool_src = self.m.path.join(llvm_bin_dir, tool + ext)
+      tool_dst = self.m.path.join(build_dir, tool + ext)
+
+      if not self.m.path.exists(tool_src):
+        continue
+
+      try:
+        self.m.file.copy('Copy ' + tool, tool_src, tool_dst)
+      except self.m.step.StepFailure:  # pragma: no cover
+        # On some builds, it appears that a soft/hard link of llvm-symbolizer
+        # exists in the build directory, which causes shutil.copy to raise an
+        # exception. Either way, this shouldn't cause the whole build to fail.

[Nico, 2016/10/07 20:04:31]

Doesn't this still have the "only works on clobber bots" problem?

[Oliver Chang, 2016/10/07 20:34:58]

file.copy should always replace the destination. This guards against a weird
case we noticed on the lkgr bots that causes an exception. Since the destination
is already a link of the source, it doesn't matter if it fails.

+        pass
+
     # Build the list of files to archive.
     zip_file_list = [f for f in self.m.file.listdir('build_dir', build_dir)
                      if self._cf_should_package_file(f)]
 
     # Use the legacy platform name as Clusterfuzz has some expectations on
     # this (it only affects Windows, where it replace 'win' by 'win32').
     pieces = [self.legacy_platform_name(), target.lower()]
     if archive_subdir_suffix:
       pieces.append(archive_subdir_suffix)
     subdir = '-'.join(pieces)
@@ skipping 153 matching lines @@
   def legacy_download_url(self, gs_bucket_name, extra_url_components=None):
     """Returns a url suitable for downloading a Chromium build from
     Google Storage.
 
     extra_url_components, if specified, should be a string without a
     trailing '/' which is inserted in the middle of the URL.
 
     The builder_name, or parent_buildername, is always automatically
     inserted into the URL."""
     return self._legacy_url(True, gs_bucket_name, extra_url_components)