Sanitizer spring cleaning

master/master_fyi_builders_cfg.py

 # Copyright (c) 2014 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 the FYI buildbot master to run.
 
 
 #pylint: disable=C0301
 
 
@@ skipping 13 matching lines @@
     Moz2DCanaryFactory as f_moz2d
 from skia_master_scripts.recreate_skps_factory import \
     RecreateSKPsFactory as f_skps
 from skia_master_scripts.xsan_factory import XsanFactory as f_xsan
 
 import master_builders_cfg
 
 
 # GYP_DEFINES.
 MOZ2D = repr({'skia_moz2d': '1'})
+NO_GPU = repr({'skia_gpu': '0'})

[borenet, 2014/06/04 19:17:12]

I'd import this from master_builders_cfg rather than redefining it here.

[mtklein, 2014/06/04 19:36:01]

Done.

 
 
 def setup_canaries(helper, do_upload_render_results, do_upload_bench_results):
   """Set up the Canary builders.
 
   Args:
       helper: instance of utils.SkiaHelper
       do_upload_render_results: bool; whether the builders should upload their
           render results.
       do_upload_bench_results: bool; whether the builders should upload their
@@ skipping 26 matching lines @@
           render results.
       do_upload_bench_results: bool; whether the builders should upload their
           bench results.
   """
   #
   #                            TEST AND PERF BUILDERS
   #
   #    Role,   OS,         Model,         GPU,      Arch,      Config,   Extra Config,GYP_DEFS,Factory,  Target, Scheduler,   Extra Args
   #
   builder_specs = [
-      ('Test', 'Ubuntu13', 'ShuttleA',   'HD2000',  'x86_64',  'Debug',  'TSAN',      None,    f_xsan,   LINUX,  S_PERCOMMIT, {'sanitizer': 'thread'}),
-      ('Test', 'Linux',    'Bare',       'NoGPU',   'Arm8_64', 'Debug',  None,        None,    f_a64mod, LINUX,  S_PERCOMMIT, {'board': 'arm64emu', 'bench_pictures_cfg': 'no_gpu', 'default_timeout': 100000}),
+      ('Test', 'Ubuntu13.10', 'GCE',   'NoGPU',  'x86_64',  'Release', 'TSAN',      NO_GPU,  f_xsan,   LINUX,  S_PERCOMMIT, {'sanitizer': 'thread'}),
+      ('Test', 'Linux',       'Bare',  'NoGPU',  'Arm8_64', 'Debug',   None,        None,    f_a64mod, LINUX,  S_PERCOMMIT, {'board': 'arm64emu', 'bench_pictures_cfg': 'no_gpu', 'default_timeout': 100000}),
   ]
 
   master_builders_cfg.setup_builders_from_config_list(
       builder_specs,
       helper,
       do_upload_render_results,
       do_upload_bench_results,
       master_builders_cfg.Builder)
 
 
@@ skipping 37 matching lines @@
           render results.
       do_upload_bench_results: bool; whether the builders should upload their
           bench results.
   """
   setup_test_and_perf_builders(helper, do_upload_render_results,
                                do_upload_bench_results)
   setup_canaries(helper, do_upload_render_results, do_upload_bench_results)
   setup_housekeepers(helper=helper,
                      do_upload_render_results=do_upload_render_results,
                      do_upload_bench_results=do_upload_bench_results)