Add the ability for tests to have more than one name.

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 243 matching lines @@
                                             nohooks_on_update=nohooks_on_update,
                                             target_os=target_os)
 
   def _AddTests(self, factory_cmd_obj, tests, mode=None,
                 factory_properties=None):
     """Add the tests listed in 'tests' to the factory_cmd_obj."""
     factory_properties = factory_properties or {}
     tests = (tests or [])[:]
 
     # This function is too crowded, try to simplify it a little.
-    def R(test):
-      if gclient_factory.ShouldRunTest(tests, test):
-        tests.remove(test)
-        return True
+    def R(*testnames):
+      for test in testnames:
+        if gclient_factory.ShouldRunTest(tests, test):
+          tests.remove(test)
+          return True
     f = factory_cmd_obj
     fp = factory_properties
 
     # Copy perf expectations from slave to master for use later.
     if factory_properties.get('expectations'):
       f.AddUploadPerfExpectations(factory_properties)
 
     # When modifying the order of the tests here, please take
     # http://build.chromium.org/buildbot/waterfall/stats into account.
     # Tests that fail more often should be earlier in the queue.
@@ skipping 25 matching lines @@
     if R('check_perms'):
       f.AddCheckPermsStep()
     if R('check_perms_br'):
       f.AddBuildrunnerCheckPermsStep()
     if R('check_licenses'):
       f.AddCheckLicensesStep(fp)
     if R('check_licenses_br'):
       f.AddBuildrunnerCheckLicensesStep(fp)
 
     # Small ("module") unit tests:
-    if R('base'):
+    if R('base', 'base_unittests'):
       f.AddAnnotatedGTestTestStep('base_unittests', fp)
     if R('base_br'):
       f.AddBuildrunnerGTest('base_unittests', fp)
-    if R('cacheinvalidation'):
+    if R('cacheinvalidation', 'cacheinvalidation_unittests'):
       f.AddAnnotatedGTestTestStep('cacheinvalidation_unittests', fp)
     if R('cacheinvalidation_br'):
       f.AddBuildrunnerGTest('cacheinvalidation_unittests', fp)
     if R('cc_unittests'):
       f.AddAnnotatedGTestTestStep('cc_unittests', fp)
     if R('cc_unittests_br'):
       f.AddBuildrunnerGTest('cc_unittests', fp)
     if R('chromeos_unittests'):
       f.AddAnnotatedGTestTestStep('chromeos_unittests', fp)
     if R('courgette'):
       f.AddAnnotatedGTestTestStep('courgette_unittests', fp)
     if R('courgette_br'):
       f.AddBuildrunnerGTest('courgette_unittests', fp)
-    if R('crypto'):
+    if R('crypto', 'crypto_unittests'):
       f.AddAnnotatedGTestTestStep('crypto_unittests', fp)
     if R('crypto_br'):
       f.AddBuildrunnerGTest('crypto_unittests', fp)
     if R('dbus'):
       f.AddAnnotatedGTestTestStep('dbus_unittests', fp)
     if R('dbus_br'):
       f.AddBuildrunnerGTest('dbus_unittests', fp)
-    if R('googleurl'):
+    if R('googleurl', 'googleurl_unittests'):
       f.AddAnnotatedGTestTestStep('googleurl_unittests', fp)
     if R('googleurl_br'):
       f.AddBuildrunnerGTest('googleurl_unittests', fp)
-    if R('gpu'):
+    if R('gpu', 'gpu_unittests'):
       f.AddAnnotatedGTestTestStep(
           'gpu_unittests', fp, arg_list=['--gmock_verbose=error'])
     if R('gpu_br'):
       f.AddBuildrunnerGTest(
           'gpu_unittests', fp, arg_list=['--gmock_verbose=error'])
-    if R('jingle'):
+    if R('jingle', 'jingle_unittests'):
       f.AddAnnotatedGTestTestStep('jingle_unittests', fp)
     if R('jingle_br'):
       f.AddBuildrunnerGTest('jingle_unittests', fp)
     if R('content_unittests'):
       f.AddAnnotatedGTestTestStep('content_unittests', fp)
     if R('content_unittests_br'):
       f.AddBuildrunnerGTest('content_unittests', fp)
     if R('device_unittests'):
       f.AddAnnotatedGTestTestStep('device_unittests', fp)
     if R('device_unittests_br'):
       f.AddBuildrunnerGTest('device_unittests', fp)
-    if R('media'):
+    if R('media', 'media_unittests'):
       f.AddAnnotatedGTestTestStep('media_unittests', fp)
     if R('media_br'):
       f.AddBuildrunnerGTest('media_unittests', fp)
-    if R('net'):
+    if R('net', 'net_unittests'):
       f.AddAnnotatedGTestTestStep('net_unittests', fp)
     if R('net_br'):
       f.AddBuildrunnerGTest('net_unittests', fp)
     if R('ppapi_unittests'):
       f.AddAnnotatedGTestTestStep('ppapi_unittests', fp)
     if R('ppapi_unittests_br'):
       f.AddBuildrunnerGTest('ppapi_unittests', fp)
-    if R('printing'):
+    if R('printing', 'printing_unittests'):
       f.AddAnnotatedGTestTestStep('printing_unittests', fp)
     if R('printing_br'):
       f.AddBuildrunnerGTest('printing_unittests', fp)
-    if R('remoting'):
+    if R('remoting', 'remoting_unittests'):
       f.AddAnnotatedGTestTestStep('remoting_unittests', fp)
     if R('remoting_br'):
       f.AddBuildrunnerGTest('remoting_unittests', fp)
     if R('test_shell'):
       f.AddAnnotatedGTestTestStep('test_shell_tests', fp)
     if R('test_shell_br'):
       f.AddBuildrunnerGTest('test_shell_tests', fp)
     # Windows sandbox
     if R('sandbox'):
       f.AddAnnotatedGTestTestStep('sbox_unittests', fp)
@@ skipping 21 matching lines @@
     if R('aura_br'):
       f.AddBuildrunnerGTest('aura_unittests', fp)
     if R('aura_shell') or R('ash') or R('ash_unittests'):
       f.AddAnnotatedGTestTestStep('ash_unittests', fp)
     if R('compositor'):
       f.AddAnnotatedGTestTestStep('compositor_unittests', fp)
     if R('compositor_br'):
       f.AddBuildrunnerGTest('compositor_unittests', fp)
 
     # Medium-sized tests (unit and browser):
-    if R('unit'):
+    if R('unit', 'unit_tests'):
       f.AddAnnotatedChromeUnitTests(fp)
     if R('unit_br'):

[M-A Ruel, 2012/11/28 14:05:42]

These ones too.

[iannucci, 2012/11/28 19:17:11]

Hm... The point of the change was to make the test names == compile targets.
Would unit_tests_br really help anything?

It would be better, IMO, if use_buildrunner was a flag passed to this function
instead, so that the test names would not have to be different. Or something
like that...

       f.AddBuildrunnerChromeUnitTests(fp)
     # A snapshot of the "ChromeUnitTests" available for individual selection
     if R('unit_ipc'):
       f.AddAnnotatedGTestTestStep('ipc_tests', fp)
     if R('unit_ipc_br'):
       f.AddBuildrunnerGTest('ipc_tests', fp)
     if R('unit_sync'):
       f.AddAnnotatedGTestTestStep('sync_unit_tests', fp)
     if R('unit_sync_br'):
       f.AddBuildrunnerGTest('sync_unit_tests', fp)
@@ skipping 832 matching lines @@
                                                build_dir=web_build_dir)
       chromium_cmd_obj.AddChromebotServer(factory_properties)
       chromium_cmd_obj.AddReliabilityTests(client_os)
     elif slave_type == 'ChromebotClient':
       chromium_cmd_obj.AddGetBuildForChromebot(client_os,
                                                extract=True,
                                                build_url=build_url)
       chromium_cmd_obj.AddChromebotClient(factory_properties)
 
     return factory