Include crypto_unittests for Valgrind, Heapcheck, and TSAN

masters/master.chromium.memory/master.cfg

 # Copyright (c) 2011 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 buildbot.changes import svnpoller
 from buildbot.scheduler import Dependent
 from buildbot.scheduler import Scheduler
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
 from master import build_utils
@@ skipping 166 matching lines @@
            ],
     factory_properties={
         'needs_valgrind' : True,
         'gclient_env': { 'GYP_DEFINES' : valgrind_x86_gyp_defines}})
 
 f_chromium_rel_linux_valgrind_tests_2 = F_LINUX(
     target='Release',
     slave_type='Tester',
     build_url=chromium_linux_valgrind_archive,
     tests=['valgrind_base',
+           'valgrind_crypto',
            'valgrind_ui_3_of_8',
            'valgrind_ui_4_of_8',
            ],
     factory_properties={
         'needs_valgrind' : True,
         'gclient_env': { 'GYP_DEFINES' : valgrind_x86_gyp_defines}})
 
 f_chromium_rel_linux_valgrind_tests_3 = F_LINUX(
     target='Release',
     slave_type='Tester',
@@ skipping 25 matching lines @@
     factory_properties={
       'needs_valgrind' : True,
       'gclient_env': { 'GYP_DEFINES' : valgrind_x86_gyp_defines}})
 
 f_chromium_rel_linux_tsan = F_LINUX(
     target='Release',
     slave_type='Tester',
     build_url=chromium_linux_valgrind_archive,
     tests=['tsan_app',
            'tsan_base',
+           'tsan_crypto',

[Timur Iskhodzhanov, 2011/05/19 16:51:39]

Are there any threads in crypto tests?

[Ryan Sleevi, 2011/05/20 01:35:33]

Not directly, but possibly in the underlying libraries.

I added it to tsan given that all of the tests were previously covered by
tsan_base, and the goal was to restore equivalent coverage. I'm not sure if tsan
is necessary though.

            'tsan_googleurl',
            'tsan_net',
            'tsan_ipc',
            'tsan_media',
            'tsan_printing',
            'tsan_remoting',
            'tsan_gfx',
            'tsan_sync',
            'tsan_unit_1_of_2',
            'tsan_unit_2_of_2',
@@ skipping 22 matching lines @@
            ],
     factory_properties={
         'needs_valgrind' : True,
         'gclient_env': { 'GYP_DEFINES' : valgrind_x86_gyp_defines}})
 
 f_chromium_rel_linux_valgrind_builder = F_LINUX(
     target='Release',
     slave_type='Builder',
     options=['app_unittests',
              'base_unittests',
+             'crypto_unittests',
              'googleurl_unittests',
              'ipc_tests',
              'media_unittests',
              'net_unittests',
              'gfx_unittests',
              'printing_unittests',
              'remoting_unittests',
              'safe_browsing_tests',
              'sync_unit_tests',
              'ui_tests',
@@ skipping 10 matching lines @@
     target='Debug',
     options=['googleurl_unittests',
              'printing_unittests',
              'media_unittests',
              'courgette_unittests',
              'remoting_unittests',
              'app_unittests',
              'sync_unit_tests',
              'ipc_tests',
              'base_unittests',
+             'crypto_unittests',
              'net_unittests',
              'gfx_unittests',
              'unit_tests',
              'test_shell_tests',
              'DumpRenderTree',
              ],
     tests=['heapcheck_googleurl',
            'heapcheck_printing',
            'heapcheck_media',
            'heapcheck_courgette',
            'heapcheck_remoting',
            'heapcheck_app',
            'heapcheck_sync',
            'heapcheck_ipc',
            'heapcheck_base',
+           'heapcheck_crypto',
            'heapcheck_net',
            'heapcheck_gfx',
            'heapcheck_unit',
            'heapcheck_test_shell',
            ],
     factory_properties={
         'gclient_env': {'GYP_DEFINES' : heapcheck_gyp_defines} },
 )
 
 
@@ skipping 16 matching lines @@
 
 # We use debug builds for mac valgrind bots because we can't get stacks on
 # release builds.
 f_cr_rel_mac_valgrind_builder = F_MAC(
     slave_type='Builder',
     target='Debug',
     factory_properties={
         'needs_valgrind' : True,
         'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines}},
     options=['--', '-project', '../build/all.xcodeproj',
              '-target', 'chromium_builder_dbg_valgrind_mac'])

[Timur Iskhodzhanov, 2011/05/19 16:51:39]

you need to add the crypto_unittests dependency to this target in build/all.gyp
first

[Ryan Sleevi, 2011/05/20 01:35:33]

Good catch. Thankfully, it is already there.

 
 f_cr_dbg_mac_valgrind = F_MAC(
     build_url=chromium_mac_valgrind_archive,
     slave_type='Tester',
     factory_properties={
         'needs_valgrind' : True,
         'gclient_env': {'GYP_DEFINES' : valgrind_mac_gyp_defines} },
     tests=['valgrind_app',

[Timur Iskhodzhanov, 2011/05/19 16:51:39]

Can you please add a CAPS comment before the tests=[ line describing that one
should add the tests to the build target before adding the tests runs?

            'valgrind_base',
+           'valgrind_crypto',

[Timur Iskhodzhanov, 2011/05/19 16:51:39]

How much time do they take under Valgrind on Mac?

[Ryan Sleevi, 2011/05/20 01:35:33]

I'm not sure. Previously these tests were part of valgrind_base, which is why I
placed everything to go with the base counterpart. However, my understanding is
that tests are listed "quickest to slowest", so perhaps this isn't the right
place?

[Timur Iskhodzhanov, 2011/05/20 08:39:11]

Looks like the Mac/Valgrind order is closer to alphabetic or just random :)
OK, you may leave the order this way.

On 2011/05/20 01:35:33, Ryan Sleevi wrote:

            'valgrind_googleurl',
            'valgrind_ipc',
            'valgrind_media',
            'valgrind_net',
            'valgrind_printing',
            'valgrind_remoting',
            'valgrind_safe_browsing',
            'valgrind_gfx',
            'valgrind_unit_1_of_2',
            'valgrind_unit_2_of_2',
            ])
 
 f_cr_dbg_mac_tsan = F_MAC(
     build_url=chromium_mac_valgrind_archive,
     slave_type='Tester',
     factory_properties={
         'needs_valgrind' : True,
         'gclient_env': {'GYP_DEFINES' : valgrind_mac_gyp_defines} },
     tests=['tsan_app',

[Timur Iskhodzhanov, 2011/05/19 16:51:39]

ditto: comment

            'tsan_base',
+           'tsan_crypto',
            'tsan_googleurl',
            'tsan_net',
            'tsan_ipc',
            'tsan_media',
            'tsan_printing',
            'tsan_remoting',
            'tsan_gfx',
            'tsan_sync'])
 
 f_cr_rel_mac_valgrind_ui_1 = F_MAC(
@@ skipping 52 matching lines @@
            ],
     options=['unit_tests',
              'ui_tests'],
     factory_properties={
       'needs_valgrind' : True,
       'gclient_env': {'GYP_DEFINES' : valgrind_cros_gyp_defines}})
 
 f_chromium_rel_chromeos_valgrind_tests_2 = F_CR_OS(
     target='Release',
     tests=['valgrind_base',
+           'valgrind_crypto',
            'valgrind_ui_3_of_8',
            'valgrind_ui_4_of_8',
            ],
     options=['base_unittests',
+             'crypto_unittests',
              'ui_tests'],
     factory_properties={
       'needs_valgrind' : True,
       'gclient_env': {'GYP_DEFINES' : valgrind_cros_gyp_defines}})
 
 f_chromium_rel_chromeos_valgrind_tests_3 = F_CR_OS(
     target='Release',
     tests=['valgrind_net',
            'valgrind_gfx',
            'valgrind_ui_5_of_8',
@@ skipping 33 matching lines @@
 f_chromium_dbg_win_tsan = F_WIN(
     target='Debug',
     tests=[
       'tsan_googleurl',
       'tsan_printing',
       'tsan_remoting',
       'tsan_app',
       'tsan_media',
       'tsan_ipc',
       'tsan_base',
+      'tsan_crypto',
       'tsan_net',
     ],
     project='all.sln;chromium_builder_dbg_tsan_win',

[Timur Iskhodzhanov, 2011/05/19 16:51:39]

ditto: you need to add crypto_unittests dependency to this target as well.

[Ryan Sleevi, 2011/05/20 01:35:33]

Thanks. Similar with Mac, it is also already in place.

     factory_properties={
       'needs_tsan_win' : True,
       'gclient_env': { 'GYP_DEFINES' : pin_gyp_defines },
     },
 )
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
 # The 'builders' list defines the Builders. Each one is configured with a
@@ skipping 229 matching lines @@
                  'buildETAUpdate', 'stepStarted', 'stepTextChanged',
                  'stepText2Changed', 'stepETAUpdate', 'logStarted',
                  'logFinished', 'buildedRemoved', 'slaveConnected',
                  'slaveDisconnected')))
 
 
 ####### PROJECT IDENTITY
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.memory/'