Make the linux_chromium_cfi_rel_ng trybot more useful.

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 34 matching lines @@
 def fix_python_path(cmd):
   """Returns the fixed command line to call the right python executable."""
   out = cmd[:]
   if out[0] == 'python':
     out[0] = sys.executable
   elif out[0].endswith('.py'):
     out.insert(0, sys.executable)
   return out
 
 
-def get_sanitizer_env(cmd, asan, lsan, msan, tsan):
+def get_sanitizer_env(cmd, asan, lsan, msan, tsan, cfi_diag):
   """Returns the envirnoment flags needed for sanitizer tools."""
 
   extra_env = {}
 
   # Instruct GTK to use malloc while running sanitizer-instrumented tests.
   extra_env['G_SLICE'] = 'always-malloc'
 
   extra_env['NSS_DISABLE_ARENA_FREE_LIST'] = '1'
   extra_env['NSS_DISABLE_UNLOAD'] = '1'
 
   # TODO(glider): remove the symbolizer path once
   # https://code.google.com/p/address-sanitizer/issues/detail?id=134 is fixed.
   symbolizer_path = os.path.join(ROOT_DIR,
       'third_party', 'llvm-build', 'Release+Asserts', 'bin', 'llvm-symbolizer')
 
   if lsan or tsan:
     # LSan is not sandbox-compatible, so we can use online symbolization. In
     # fact, it needs symbolization to be able to apply suppressions.
     symbolization_options = ['symbolize=1',
                              'external_symbolizer_path=%s' % symbolizer_path]
-  elif (asan or msan) and sys.platform not in ['win32', 'cygwin']:
+  elif (asan or msan or cfi_diag) and sys.platform not in ['win32', 'cygwin']:
     # ASan uses a script for offline symbolization, except on Windows.
     # Important note: when running ASan 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
   else:
     symbolization_options = []
 
   if asan:
@@ skipping 26 matching lines @@
   if msan:
     msan_options = symbolization_options[:]
     if lsan:
       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)
 
+  # CFI uses the UBSan runtime to provide diagnostics.
+  if cfi_diag:
+    ubsan_options = symbolization_options[:] + ['print_stacktrace=1']
+    extra_env['UBSAN_OPTIONS'] = ' '.join(ubsan_options)
+
   return extra_env
 
 
 def get_sanitizer_symbolize_command(json_path=None, executable_path=None):
   """Construct the command to invoke offline symbolization script."""
   script_path = os.path.join(
       ROOT_DIR, '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)
@@ skipping 45 matching lines @@
   # Used by base/base_paths_linux.cc as an override. Just make sure the default
   # logic is used.
   env.pop('CR_SOURCE_ROOT', None)
   extra_env.update(get_sandbox_env(env))
 
   # Copy logic from  tools/build/scripts/slave/runtest.py.
   asan = '--asan=1' in cmd
   lsan = '--lsan=1' in cmd
   msan = '--msan=1' in cmd
   tsan = '--tsan=1' in cmd
+  cfi_diag = '--cfi-diag=1' in cmd
   if sys.platform in ['win32', 'cygwin']:
     # Symbolization works in-process on Windows even when sandboxed.
     use_symbolization_script = False
   else:
     # LSan doesn't support sandboxing yet, so we use the in-process symbolizer.
     # Note that ASan and MSan can work together with LSan.
-    use_symbolization_script = (asan or msan) and not lsan
+    use_symbolization_script = (asan or msan or cfi_diag) and not lsan
 
-  if asan or lsan or msan or tsan:
-    extra_env.update(get_sanitizer_env(cmd, asan, lsan, msan, tsan))
+  if asan or lsan or msan or tsan or cfi_diag:
+    extra_env.update(get_sanitizer_env(cmd, asan, lsan, msan, tsan, cfi_diag))
 
   if lsan or tsan:
     # LSan and TSan are not sandbox-friendly.
     cmd.append('--no-sandbox')
 
   cmd = trim_cmd(cmd)
 
   # Ensure paths are correctly separated on windows.
   cmd[0] = cmd[0].replace('/', os.path.sep)
   cmd = fix_python_path(cmd)
@@ skipping 26 matching lines @@
     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())