Change asan_coverage(deprecated) flag to sanitizer_coverage. Enable edge-level code coverage by def…

masters/master.chromium.lkgr/master_lkgr_cfg.py

 # 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.
 
 from master import gitiles_poller
 from master import master_config
 from master.factory import annotator_factory
 from master.factory import chromium_factory
 
 import master_site_config
@@ skipping 74 matching lines @@
 ## Mac
 ################################################################################
 
 B('Mac', 'mac_full', 'compile|testers', 'chromium_lkgr')
 F('mac_full', mac().ChromiumFactory(
     clobber=True,
     factory_properties={'archive_build': ActiveMaster.is_production_host,
                         'gs_bucket': 'gs://chromium-browser-continuous',
                         'gs_acl': 'public-read',}))
 
+mac_asan_rel_gyp = ('asan=1 enable_ipc_fuzzer=1 v8_enable_verify_heap=1 ')

[earthdok, 2015/02/24 16:46:14]

You're making a functional change (v8_enable_verify_heap=1) which is not related
to the CL.

+
 B('Mac ASAN Release', 'mac_asan_rel', 'compile', 'chromium_lkgr')
 F('mac_asan_rel', linux().ChromiumASANFactory(
     clobber=True,
     options=['--compiler=goma-clang', '--', '-target', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'asan',
        'gs_bucket': 'gs://chromium-browser-asan',
        'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': 'asan=1 '}}))
+       'gclient_env': {'GYP_DEFINES': mac_asan_rel_gyp}}))
+
+mac_asan_debug_gyp = ('asan=1 component=static_library enable_ipc_fuzzer=1 ')

[earthdok, 2015/02/24 16:46:14]

As a side note, it would be nice to have a comment explaining why debug requires
component=static_library.

 
 B('Mac ASAN Debug', 'mac_asan_dbg', 'compile', 'chromium_lkgr')
 F('mac_asan_dbg', linux().ChromiumASANFactory(
     clobber=True,
     target='Debug',
     options=['--compiler=goma-clang', '--', '-target', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'asan',
        'gs_bucket': 'gs://chromium-browser-asan',
        'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': 'asan=1 component=static_library '}}))
+       'gclient_env': {'GYP_DEFINES': mac_asan_debug_gyp}}))
 
 ################################################################################
 ## Linux
 ################################################################################
 
 B('Linux', 'linux_full', 'compile|testers', 'chromium_lkgr')
 F('linux_full', linux().ChromiumFactory(
     clobber=True,
     factory_properties={'archive_build': ActiveMaster.is_production_host,
                         'gs_bucket': 'gs://chromium-browser-continuous',
                         'gs_acl': 'public-read',}))
 
 B('Linux x64', 'linux64_full', 'compile|testers', 'chromium_lkgr')
 F('linux64_full', linux().ChromiumFactory(
     clobber=True,
     factory_properties={
         'archive_build': ActiveMaster.is_production_host,
         'gs_bucket': 'gs://chromium-browser-continuous',
         'gs_acl': 'public-read',
         'gclient_env': {'GYP_DEFINES':'target_arch=x64'}}))
 
-asan_rel_gyp = ('asan=1 lsan=1 asan_coverage=1 '
-                'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 ')
+asan_rel_gyp = ('asan=1 lsan=1 sanitizer_coverage=3 '
+                'enable_ipc_fuzzer=1 v8_enable_verify_heap=1 ')
 
 B('ASAN Release', 'linux_asan_rel', 'compile', 'chromium_lkgr')
 F('linux_asan_rel', linux().ChromiumASANFactory(
     compile_timeout=2400,  # We started seeing 29 minute links, bug 360158
     clobber=True,
     options=['--compiler=clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'asan',
        'gs_bucket': 'gs://chromium-browser-asan',
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_rel_gyp}}))
 
-asan_rel_sym_gyp = ('asan=1 lsan=1 asan_coverage=1 '
-                    'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 '
+asan_rel_sym_gyp = ('asan=1 lsan=1 sanitizer_coverage=3 '
+                    'enable_ipc_fuzzer=1 v8_enable_verify_heap=1 '
                     'release_extra_cflags="-O1 -fno-inline-functions '
                     '-fno-inline" ')
 
 B('ASAN Release (symbolized)', 'linux_asan_rel_sym', 'compile', 'chromium_lkgr')
 F('linux_asan_rel_sym', linux().ChromiumASANFactory(
     clobber=True,
     options=['--compiler=clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'asan-symbolized',
        'gs_bucket': 'gs://chromium-browser-asan',
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_rel_sym_gyp}}))
 
-asan_debug_gyp = ('asan=1 lsan=1 asan_coverage=1 enable_ipc_fuzzer=1')
+asan_debug_gyp = ('asan=1 lsan=1 sanitizer_coverage=3 enable_ipc_fuzzer=1 ')
 
 B('ASAN Debug', 'linux_asan_dbg', 'compile', 'chromium_lkgr')
 F('linux_asan_dbg', linux().ChromiumASANFactory(
     clobber=True,
     target='Debug',
     options=['--compiler=clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'asan',
        'gs_bucket': 'gs://chromium-browser-asan',
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_debug_gyp}}))
 
 asan_chromiumos_rel_gyp = ('%s chromeos=1' % asan_rel_gyp)
 
 B('ChromiumOS ASAN Release', 'linux_chromiumos_asan_rel', 'compile',
   'chromium_lkgr')
 F('linux_chromiumos_asan_rel', linux().ChromiumASANFactory(
     compile_timeout=2400,  # We started seeing 29 minute links, bug 360158
     clobber=True,
     options=['--compiler=clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'asan',
        'cf_archive_subdir_suffix': 'chromeos',
        'gs_bucket': 'gs://chromium-browser-asan',
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': asan_chromiumos_rel_gyp}}))
 
-asan_ia32_v8_arm = ('asan=1 asan_coverage=1 disable_nacl=1 '
+asan_ia32_v8_arm = ('asan=1 sanitizer_coverage=3 disable_nacl=1 '
                     'v8_target_arch=arm host_arch=x86_64 target_arch=ia32 '
                     'sysroot=/var/lib/chroot/precise32bit chroot_cmd=precise32 '
-                    'v8_enable_verify_heap=1 enable_ipc_fuzzer=1')
+                    'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 ')
 
 asan_ia32_v8_arm_rel_sym = ('%s release_extra_cflags="-O1 '
                             '-fno-inline-functions -fno-inline"' %
                             asan_ia32_v8_arm)
 asan_ia32_v8_arm_rel = asan_ia32_v8_arm
 
 # The build process is described at
 # https://sites.google.com/a/chromium.org/dev/developers/testing/addresssanitizer#TOC-Building-with-v8_target_arch-arm
 B('ASan Debug (32-bit x86 with V8-ARM)',
   'linux_asan_dbg_ia32_v8_arm',
@@ skipping 63 matching lines @@
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'tsan',
        'gs_bucket': 'gs://chromium-browser-tsan',
        'gs_acl': 'public-read',
        'tsan': True,
        'gclient_env': {'GYP_DEFINES': tsan_gyp}}))
 
 # The build process for MSan is described at
 # http://dev.chromium.org/developers/testing/memorysanitizer
-msan_gyp = ('msan=1 use_instrumented_libraries=1 '
-            'instrumented_libraries_jobs=5 ')
+msan_gyp = ('msan=1 sanitizer_coverage=3 '
+            'use_instrumented_libraries=1 instrumented_libraries_jobs=5 ')
 
 B('MSAN Release (no origins)', 'linux_msan_rel_no_origins', 'compile',
   'chromium_lkgr')
 F('linux_msan_rel_no_origins', linux().ChromiumFactory(
     clobber=True,
     target='Release',
     options=['--compiler=goma-clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'msan-no-origins',
@@ skipping 14 matching lines @@
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': msan_gyp + 'msan_track_origins=2 '}}))
 
 # This is a bot that uploads LKGR telemetry harnesses to Google Storage.
 B('Telemetry Harness Upload', 'telemetry_harness_upload', None, 'chromium_lkgr')
 F('telemetry_harness_upload',
   m_annotator.BaseFactory('perf/telemetry_harness_upload'))
 
 # The build process for UBSan vptr is described at
 # http://dev.chromium.org/developers/testing/undefinedbehaviorsanitizer
-ubsan_gyp = ('ubsan=1')
+ubsan_gyp = ('ubsan=1 sanitizer_coverage=3 ')
 
 B('UBSan Release', 'linux_ubsan_rel', 'compile', 'chromium_lkgr')
 F('linux_ubsan_rel', linux().ChromiumFactory(
     clobber=True,
     target='Release',
     options=['--compiler=goma-clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_name': 'ubsan',
        'gs_bucket': 'gs://chromium-browser-ubsan',
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': ubsan_gyp}}))
 
-ubsan_vptr_gyp = ('ubsan_vptr=1')
+ubsan_vptr_gyp = ('ubsan_vptr=1 sanitizer_coverage=3 ')
 
 B('UBSan vptr Release', 'linux_ubsan_vptr_rel', 'compile', 'chromium_lkgr')
 F('linux_ubsan_vptr_rel', linux().ChromiumFactory(
     clobber=True,
     target='Release',
     options=['--compiler=goma-clang', 'chromium_builder_asan'],
     factory_properties={
        'cf_archive_build': ActiveMaster.is_production_host,
        'cf_archive_subdir_suffix': 'vptr',
        'cf_archive_name': 'ubsan-vptr',
@@ skipping 20 matching lines @@
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     ))
 
 
 def Update(_config, active_master, c):
   lkgr_poller = gitiles_poller.GitilesPoller(
       'https://chromium.googlesource.com/chromium/src',
       branches=['lkgr'])
   c['change_source'].append(lkgr_poller)
   return helper.Update(c)