Fix report symbolization on swarming bots.

testing/test_env.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Sets environment variables needed to run a chromium unit test."""
 
 import os
 import stat
 import subprocess
@@ skipping 106 matching lines @@
       msan_options.append('detect_leaks=1')
     extra_env['MSAN_OPTIONS'] = ' '.join(msan_options)
 
   if tsan:
     tsan_options = symbolization_options[:]
     extra_env['TSAN_OPTIONS'] = ' '.join(tsan_options)
 
   return extra_env
 
 
-def get_sanitizer_symbolize_command(json_path=None):
+def get_sanitizer_symbolize_command(json_path=None, executable_path=None):
   """Construct the command to invoke offline symbolization script."""
   script_path = '../tools/valgrind/asan/asan_symbolize.py'
   cmd = [sys.executable, script_path]
   if json_path is not None:
     cmd.append('--test-summary-json-file=%s' % json_path)
+  if executable_path is not None:
+    cmd.append('--executable-path=%s' % executable_path)
   return cmd
 
 
 def get_json_path(cmd):
   """Extract the JSON test summary path from a command line."""
   json_path_flag = '--test-launcher-summary-output='
   for arg in cmd:
     if arg.startswith(json_path_flag):
       return arg.split(json_path_flag).pop()
   return None
 
 
 def symbolize_snippets_in_json(cmd, env):
   """Symbolize output snippets inside the JSON test summary."""
   json_path = get_json_path(cmd)
   if json_path is None:
     return
 
   try:
-    symbolize_command = get_sanitizer_symbolize_command(json_path=json_path)
+    symbolize_command = get_sanitizer_symbolize_command(
+        json_path=json_path, executable_path=cmd[0])
     p = subprocess.Popen(symbolize_command, stderr=subprocess.PIPE, env=env)
     (_, stderr) = p.communicate()
   except OSError as e:
       print 'Exception while symbolizing snippets: %s' % e
 
   if p.returncode != 0:
     print "Error: failed to symbolize snippets in JSON:\n"
     print stderr
 
 
@@ skipping 37 matching lines @@
         '\n'.join('    %s=%s' %
             (k, v) for k, v in sorted(extra_env.iteritems())),
         ' '.join(cmd)))
   env.update(extra_env or {})
   try:
     # See above comment regarding offline symbolization.
     if use_symbolization_script:
       # Need to pipe to the symbolizer script.
       p1 = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE,
                             stderr=sys.stdout)
-      p2 = subprocess.Popen(get_sanitizer_symbolize_command(),
-                            env=env, stdin=p1.stdout)
+      p2 = subprocess.Popen(
+          get_sanitizer_symbolize_command(executable_path=cmd[0]),
+          env=env, stdin=p1.stdout)
       p1.stdout.close()  # Allow p1 to receive a SIGPIPE if p2 exits.
       p1.wait()
       p2.wait()
       # Also feed the out-of-band JSON output to the symbolizer script.
       symbolize_snippets_in_json(cmd, env)
       return p1.returncode
     else:
       return subprocess.call(cmd, env=env)
   except OSError:
     print >> sys.stderr, 'Failed to start %s' % cmd
     raise
 
 
 def main():
   return run_executable(sys.argv[1:], os.environ.copy())
 
 
 if __name__ == '__main__':
   sys.exit(main())