Revert r293748 and r293749.

scripts/slave/runtest.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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 1011 matching lines @@
 def _GetPerfID(options):
   if options.perf_id:
     perf_id = options.perf_id
   else:
     perf_id = options.factory_properties.get('perf_id')
     if options.factory_properties.get('add_perf_id_suffix'):
       perf_id += options.build_properties.get('perf_id_suffix')
   return perf_id
 
 
-def _GetSanitizerSymbolizeCommand(strip_path_prefix=None, json_file_name=None):
-  script_path = os.path.abspath(os.path.join('src', 'tools', 'valgrind',
-                                             'asan', 'asan_symbolize.py'))
-  command = [sys.executable, script_path]
-  if strip_path_prefix:
-    command.append(strip_path_prefix)
-  if json_file_name:
-    command.append('--test-summary-json-file=%s' % json_file_name)
-  return command
-
-
-def _SymbolizeSnippetsInJSON(options, json_file_name):
-  if not json_file_name:
-    return
-  symbolize_command = _GetSanitizerSymbolizeCommand(
-      strip_path_prefix=options.strip_path_prefix,
-      json_file_name=json_file_name)
-  try:
-    p = subprocess.popen(symbolize_command, stderr=subprocess.PIPE)
-    (_, 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
-
-
 def _MainParse(options, _args):
   """Run input through annotated test parser.
 
   This doesn't execute a test, but reads test input from a file and runs it
   through the specified annotation parser (aka log processor).
   """
   if not options.annotate:
     raise chromium_utils.MissingArgument('--parse-input doesn\'t make sense '
                                          'without --annotate.')
 
@@ skipping 85 matching lines @@
                                       test_exe_path=test_exe_path,
                                       document_root=options.document_root)
 
     if _UsingGtestJson(options):
       json_file_name = log_processor.PrepareJSONFile(
           options.test_launcher_summary_output)
       command.append('--test-launcher-summary-output=%s' % json_file_name)
 
     pipes = []
     if options.enable_asan:
-      symbolize_command = _GetSanitizerSymbolizeCommand()
-      pipes = [symbolize_command, ['c++filt']]
+      symbolize = os.path.abspath(os.path.join('src', 'tools', 'valgrind',
+                                               'asan', 'asan_symbolize.py'))
+      pipes = [[sys.executable, symbolize], ['c++filt']]
 
     command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options,
                                           command)
     result = _RunGTestCommand(command, extra_env, pipes=pipes,
                               log_processor=log_processor)
   finally:
     if http_server:
       http_server.StopServer()
     if _UsingGtestJson(options):
       _UploadGtestJsonSummary(json_file_name,
@@ skipping 249 matching lines @@
                    'True'),
           server_dir=special_xvfb_dir)
 
     if _UsingGtestJson(options):
       json_file_name = log_processor.PrepareJSONFile(
           options.test_launcher_summary_output)
       command.append('--test-launcher-summary-output=%s' % json_file_name)
 
     pipes = []
     # See the comment in main() regarding offline symbolization.
-    if options.use_symbolization_script:
-      symbolize_command = _GetSanitizerSymbolizeCommand(
-          strip_path_prefix=options.strip_path_prefix)
-      pipes = [symbolize_command]
+    if (options.enable_asan or options.enable_msan) and not options.enable_lsan:
+      symbolize = os.path.abspath(os.path.join('src', 'tools', 'valgrind',
+                                               'asan', 'asan_symbolize.py'))
+      asan_symbolize = [sys.executable, symbolize]
+      if options.strip_path_prefix:
+        asan_symbolize.append(options.strip_path_prefix)
+      pipes = [asan_symbolize]
 
     command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options,
                                           command)
     result = _RunGTestCommand(command, extra_env, pipes=pipes,
                               log_processor=log_processor)
   finally:
     if http_server:
       http_server.StopServer()
     if start_xvfb:
       xvfb.StopVirtualX(slave_name)
     if _UsingGtestJson(options):
-      if options.use_symbolization_script:
-        _SymbolizeSnippetsInJSON(options, json_file_name)
       if json_file_name:
         _UploadGtestJsonSummary(json_file_name,
                                 options.build_properties,
                                 test_exe)
       log_processor.ProcessJSONFile(options.build_dir)
 
   if options.generate_json_file:
     if not _GenerateJSONForTestResults(options, log_processor):
       return 1
 
@@ skipping 519 matching lines @@
       disable_sandbox_flag = '--additional-drt-flag=%s' % disable_sandbox_flag
 
     # Symbolization of sanitizer reports.
     if options.enable_tsan or options.enable_lsan:
       # TSan and LSan are not sandbox-compatible, so we can use online
       # symbolization. In fact, they need symbolization to be able to apply
       # suppressions.
       symbolization_options = ['symbolize=1',
                                'external_symbolizer_path=%s' % symbolizer_path,
                                'strip_path_prefix=%s' %  strip_path_prefix]
-      options.use_symbolization_script = False
     else:
       # ASan and MSan use a script for offline symbolization.
       # Important note: when running ASan or MSan with leak detection enabled,
       # we must use the LSan symbolization options above.
       symbolization_options = ['symbolize=0']
       # Set the path to llvm-symbolizer to be used by asan_symbolize.py
       extra_env['LLVM_SYMBOLIZER_PATH'] = symbolizer_path
-      options.use_symbolization_script = True
 
     def AddToExistingEnv(env_dict, key, options_list):
       # Adds a key to the supplied environment dictionary but appends it to
       # existing environment variables if it already contains values.
       assert type(env_dict) is dict
       assert type(options_list) is list
       env_dict[key] = ' '.join(filter(bool, [os.environ.get(key)]+options_list))
 
     # ThreadSanitizer
     if options.enable_tsan:
@@ skipping 109 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())