Sanitizer spring cleaning

master/master_builders_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.
 
 # Sets up all the builders we want this buildbot master to run.
 
 
 #pylint: disable=C0301
 
 
@@ skipping 277 matching lines @@
   builder_specs = [
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86',    'Debug',   None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86',    'Release', None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Perf', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86',    'Release', None,           None,      f_factory, LINUX,  S_PERCOMMIT, {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86_64', 'Debug',   None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86_64', 'Release', None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Perf', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86_64', 'Release', None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX550Ti',    'x86_64', 'Debug',   'ZeroGPUCache', None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX550Ti',    'x86_64', 'Release', 'Valgrind',     VALGRIND,  f_factory, LINUX,  S_PERCOMMIT,     {'flavor': 'valgrind'}),
       ('Test', 'Ubuntu13.10', 'ShuttleA',   'NoGPU',       'x86_64', 'Debug',   None,           NO_GPU,    f_factory, LINUX,  S_PERCOMMIT,     {}),
-      ('Test', 'Ubuntu13.10', 'ShuttleA',   'HD2000',      'x86_64', 'Debug',   'ASAN',         None,      f_xsan,    LINUX,  S_PERCOMMIT,     {'sanitizer': 'address'}),
+      ('Test', 'Ubuntu13.10', 'GCE',        'NoGPU',       'x86_64', 'Debug',   'ASAN',         NO_GPU,    f_xsan,    LINUX,  S_PERCOMMIT,     {'sanitizer': 'address'}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Debug',   None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT, {}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug',   None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86',    'Debug',   None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug',   None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
@@ skipping 135 matching lines @@
       # To resolve https://code.google.com/p/skia/issues/detail?id=2432
       # ('buildbots: don't run UpdateScripts if running on non-production
       # master'), I wanted to add a third boolean flag (do_update_scripts),
       # but I saw that I would need to add it in so many places I was
       # discouraged.  If the merged all the flags into a single object it
       # would be easier to add more flags.
       do_upload_render_results=active_master.do_upload_render_results,
       do_upload_bench_results=active_master.do_upload_bench_results)
 
   return helper.Update(cfg)