Add testing library to running tests.

scripts/master/factory/chromium_factory.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.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 271 matching lines @@
     if R('safe_browsing'):  f.AddBasicGTestTestStep(
                                 'safe_browsing_tests', fp,
                                 arg_list=['--ui-test-action-max-timeout=40000'])
     if R('sandbox'):
       f.AddBasicGTestTestStep('sbox_unittests', fp)
       f.AddBasicGTestTestStep('sbox_integration_tests', fp)
       f.AddBasicGTestTestStep('sbox_validation_tests', fp)
 
     if R('views'):          f.AddBasicGTestTestStep('views_unittests', fp)
     if R('aura'):           f.AddBasicGTestTestStep('aura_unittests', fp)
-    if R('aura_shell'):
+    if R('aura_shell') or R('ash'):

[Marc-Antoine Ruel (Google), 2012/03/06 23:38:03]

??

[Peter Mayo, 2012/03/07 16:22:48]

leakage from http://codereview.chromium.org/9197019/

removed.

       f.AddBasicGTestTestStep('aura_shell_unittests', fp)
     if R('compositor'):
       f.AddBasicGTestTestStep('compositor_unittests', fp)
 
     # Medium-sized tests (unit and browser):
     if R('unit'):           f.AddChromeUnitTests(fp)
     if R('browser_tests'):  f.AddBrowserTests(fp)
 
     # Big, UI tests:
     if R('ui'):             f.AddUITests(fp)
@@ skipping 52 matching lines @@
       f.AddNewTabUITests(fp)
     if R('sizes'):          f.AddSizesTests(fp)
     if R('sync'):           f.AddSyncPerfTests(fp)
     if R('mach_ports'):     f.AddMachPortsTests(fp)
 
     if R('sync_integration'):
       f.AddSyncIntegrationTests(fp)
 
     # GPU tests:
     if R('gpu_tests'):      f.AddGpuTests(fp)
+    if R('soft_gpu_tests'): f.AddSoftGpuTests(fp)
 
     # ChromeFrame tests:
     if R('chrome_frame_perftests'):
       f.AddChromeFramePerfTests(fp)
     if R('chrome_frame'):
       # Add all major CF tests.
       f.AddBasicGTestTestStep('chrome_frame_net_tests', fp)
       f.AddBasicGTestTestStep('chrome_frame_unittests', fp)
       f.AddBasicGTestTestStep('chrome_frame_tests', fp)
     else:
@@ skipping 504 matching lines @@
     if 'cros_deps' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
     if 'asan.DEPS' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           'http://src.chromium.org/svn/trunk/deps/asan.DEPS',
           'asan.DEPS'))
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)