| Index: masters/master.chromium.memory.fyi/master.cfg
|
| diff --git a/masters/master.chromium.memory.fyi/master.cfg b/masters/master.chromium.memory.fyi/master.cfg
|
| index a2d399d6238869ea98dbae553ca0502e082dc847..eb3f1bee8cba30d51a6efed8ca6d517930dc5859 100644
|
| --- a/masters/master.chromium.memory.fyi/master.cfg
|
| +++ b/masters/master.chromium.memory.fyi/master.cfg
|
| @@ -45,8 +45,6 @@ s_chromium = Scheduler(name='chromium',
|
| builderNames=[# Builders
|
| 'Chromium Windows Builder (DrMemory)',
|
| 'Chromium Windows Builder (DrMemory x64)',
|
| - 'Chromium Linux Builder (valgrind)',
|
| - 'Chromium OS Builder (valgrind)',
|
| 'Chromium Linux TSan Builder',
|
| 'Chromium Linux MSan Builder',
|
| 'Chromium Linux ChromeOS MSan Builder',
|
| @@ -86,25 +84,6 @@ s_chromium_win_drmemory_64_trigger = Triggerable(
|
| 'chromium_win_drmemory_64',
|
| t_drmemory_64_bots)
|
|
|
| -s_chromium_linux_valgrind_trigger = Triggerable(
|
| - 'chromium_linux_valgrind',
|
| - ['Linux Tests (valgrind)(1)',
|
| - 'Linux Tests (valgrind)(2)',
|
| - 'Linux Tests (valgrind)(3)',
|
| - 'Linux Tests (valgrind)(4)',
|
| - 'Linux Tests (valgrind)(5)',
|
| - ])
|
| -
|
| -s_chromium_chromeos_valgrind_trigger = Triggerable(
|
| - 'chromium_chromeos_valgrind',
|
| - ['Chromium OS (valgrind)(1)',
|
| - 'Chromium OS (valgrind)(2)',
|
| - 'Chromium OS (valgrind)(3)',
|
| - 'Chromium OS (valgrind)(4)',
|
| - 'Chromium OS (valgrind)(5)',
|
| - 'Chromium OS (valgrind)(6)',
|
| - ])
|
| -
|
| s_chromium_linux_tsan = Triggerable(
|
| name='linux_tsan',
|
| builderNames=['Linux TSan Tests'])
|
| @@ -120,8 +99,6 @@ s_chromium_linux_chromeos_msan = Triggerable(
|
| c['schedulers'] = [s_chromium,
|
| s_chromium_win_drmemory_trigger,
|
| s_chromium_win_drmemory_64_trigger,
|
| - s_chromium_linux_valgrind_trigger,
|
| - s_chromium_chromeos_valgrind_trigger,
|
| s_chromium_linux_tsan,
|
| s_chromium_linux_msan,
|
| s_chromium_linux_chromeos_msan]
|
| @@ -162,14 +139,6 @@ chromium_win_drmemory_archive = master_config.GetGSUtilUrl(
|
| chromium_win_drmemory_64_archive = master_config.GetGSUtilUrl(
|
| 'chromium-memory-fyi', 'drm-cr-64')
|
|
|
| -chromium_linux_valgrind_archive = master_config.GetGSUtilUrl(
|
| - 'chromium-memory-fyi', 'chromium-rel-linux-valgrind-builder')
|
| -
|
| -chromium_chromeos_valgrind_archive = master_config.GetGSUtilUrl(
|
| - 'chromium-memory-fyi', 'chromium-rel-chromeos-valgrind-builder')
|
| -
|
| -valgrind_cros_gyp_defines = 'build_for_tool=memcheck chromeos=1'
|
| -
|
| # IMPORTANT NOTE about adding new tests.
|
| # If you want to add a new test, make sure it's:
|
| # a) buildable,
|
| @@ -197,126 +166,6 @@ valgrind_cros_gyp_defines = 'build_for_tool=memcheck chromeos=1'
|
| # Please coordinate with the current and upcoming memory sheriff and help them
|
| # get the new tests green on all the bots after the master restart.
|
|
|
| -f_chromium_rel_linux_valgrind = m_annotator.BaseFactory('chromium')
|
| -
|
| -# ChromeOS Valgrind bots:
|
| -f_chromium_rel_chromeos_valgrind_builder = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Builder',
|
| - options=['--compiler=goma',
|
| - 'app_list_unittests',
|
| - 'ash_unittests',
|
| - 'aura_unittests',
|
| - 'base_unittests',
|
| - 'chromeos_unittests',
|
| - 'components_unittests',
|
| - 'compositor_unittests',
|
| - 'content_unittests',
|
| - 'crypto_unittests',
|
| - 'device_unittests',
|
| - 'display_unittests',
|
| - 'events_unittests',
|
| - 'extensions_unittests',
|
| - 'gcm_unit_tests',
|
| - 'gpu_unittests',
|
| - 'ipc_tests',
|
| - 'jingle_unittests',
|
| - 'media_unittests',
|
| - 'midi_unittests',
|
| - 'message_center_unittests',
|
| - 'net_unittests',
|
| - 'ppapi_unittests',
|
| - 'printing_unittests',
|
| - 'remoting_unittests',
|
| - 'sandbox_linux_unittests',
|
| - 'sql_unittests',
|
| - 'sync_unit_tests',
|
| - 'ui_base_unittests',
|
| - 'ui_touch_selection_unittests',
|
| - 'unit_tests',
|
| - 'url_unittests',
|
| - 'views_unittests',
|
| - ],
|
| - factory_properties={
|
| - 'gclient_env': {'GYP_DEFINES' : valgrind_cros_gyp_defines},
|
| - 'trigger': 'chromium_chromeos_valgrind',
|
| - 'build_url': chromium_chromeos_valgrind_archive,
|
| - 'use_mb': True,
|
| - }
|
| -)
|
| -
|
| -f_chromium_rel_chromeos_valgrind_tests_1 = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Tester',
|
| - build_url=chromium_chromeos_valgrind_archive,
|
| - tests=['valgrind_display_unittests', # Short tests, under 1 minute.
|
| - 'valgrind_events',
|
| - 'valgrind_jingle',
|
| - 'valgrind_message_center_unittests',
|
| - 'valgrind_printing',
|
| - 'valgrind_sql',
|
| - 'valgrind_ui_base_unittests',
|
| - 'valgrind_url',
|
| - 'valgrind_app_list_unittests', # Medium tests, < 10 minutes.
|
| - 'valgrind_ipc_tests',
|
| - 'valgrind_media',
|
| - 'valgrind_midi',
|
| - 'valgrind_net', # Large tests, >= 10 minute.
|
| - ],
|
| - factory_properties={ 'needs_valgrind' : True, 'chromeos': True })
|
| -
|
| -f_chromium_rel_chromeos_valgrind_tests_2 = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Tester',
|
| - build_url=chromium_chromeos_valgrind_archive,
|
| - tests=['valgrind_extensions_unittests',
|
| - ],
|
| - factory_properties={ 'needs_valgrind' : True, 'chromeos': True })
|
| -
|
| -f_chromium_rel_chromeos_valgrind_tests_3 = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Tester',
|
| - build_url=chromium_chromeos_valgrind_archive,
|
| - tests=['valgrind_aura', # Medium tests, < 10 minutes.
|
| - 'valgrind_base_unittests',
|
| - 'valgrind_chromeos_unittests',
|
| - 'valgrind_crypto',
|
| - 'valgrind_remoting',
|
| - 'valgrind_views',
|
| - 'valgrind_ash_unittests', # Large tests, >= 10 minute.
|
| - ],
|
| - factory_properties={ 'needs_valgrind' : True, 'chromeos': True })
|
| -
|
| -f_chromium_rel_chromeos_valgrind_tests_4 = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Tester',
|
| - build_url=chromium_chromeos_valgrind_archive,
|
| - tests=['valgrind_compositor', # Medium tests, < 10 minutes.
|
| - 'valgrind_content',
|
| - 'valgrind_unit_1_of_3', # Large tests, >= 10 minute.
|
| - ],
|
| - factory_properties={ 'needs_valgrind' : True, 'chromeos': True })
|
| -
|
| -f_chromium_rel_chromeos_valgrind_tests_5 = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Tester',
|
| - build_url=chromium_chromeos_valgrind_archive,
|
| - tests=['valgrind_ppapi_unittests', # Short tests, under 1 minute.
|
| - 'valgrind_gpu', # Large tests, >= 10 minute.
|
| - 'valgrind_unit_2_of_3',
|
| - ],
|
| - factory_properties={ 'needs_valgrind' : True, 'chromeos': True })
|
| -
|
| -f_chromium_rel_chromeos_valgrind_tests_6 = F_CR_OS(
|
| - target='Release',
|
| - slave_type='Tester',
|
| - build_url=chromium_chromeos_valgrind_archive,
|
| - tests=['valgrind_components', # Medium tests, < 10 minutes.
|
| - 'valgrind_sandbox',
|
| - 'valgrind_unit_3_of_3', # Large tests, >= 10 minute.
|
| - ],
|
| - factory_properties={ 'needs_valgrind' : True, 'chromeos': True })
|
| -
|
| # ThreadSanitizer bots:
|
| # Dr.Memory bots:
|
| f_chromium_rel_win_drmemory_builder = F_WIN_NINJA(
|
| @@ -599,7 +448,6 @@ f_chromium_rel_win_drmemory_64 = F_WIN_NINJA(
|
| )
|
|
|
| # Tests that are single-machine shard-safe.
|
| -# These have never been tested with Valgrind.
|
| sharded_tests = [
|
| 'aura_unittests',
|
| 'base_unittests',
|
| @@ -649,110 +497,6 @@ sharded_tests = [
|
| # look for to close the tree.
|
| #
|
|
|
| -b_chromium_rel_linux_valgrind_builder = {
|
| - 'name': 'Chromium Linux Builder (valgrind)',
|
| - 'builddir': 'chromium-rel-linux-valgrind-builder',
|
| - 'factory': f_chromium_rel_linux_valgrind,
|
| - 'category': '1Linux Valgrind|compile',
|
| - 'auto_reboot': False,
|
| -}
|
| -
|
| -b_chromium_rel_linux_valgrind_tests_1 = {
|
| - 'name': 'Linux Tests (valgrind)(1)',
|
| - 'builddir': 'chromium-rel-linux-valgrind-tests-1',
|
| - 'factory': f_chromium_rel_linux_valgrind,
|
| - 'category': '1Linux Valgrind|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_linux_valgrind_tests_2 = {
|
| - 'name': 'Linux Tests (valgrind)(2)',
|
| - 'builddir': 'chromium-rel-linux-valgrind-tests-2',
|
| - 'factory': f_chromium_rel_linux_valgrind,
|
| - 'category': '1Linux Valgrind|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_linux_valgrind_tests_3 = {
|
| - 'name': 'Linux Tests (valgrind)(3)',
|
| - 'builddir': 'chromium-rel-linux-valgrind-tests-3',
|
| - 'factory': f_chromium_rel_linux_valgrind,
|
| - 'category': '1Linux Valgrind|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_linux_valgrind_tests_4 = {
|
| - 'name': 'Linux Tests (valgrind)(4)',
|
| - 'builddir': 'chromium-rel-linux-valgrind-tests-4',
|
| - 'factory': f_chromium_rel_linux_valgrind,
|
| - 'category': '1Linux Valgrind|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_linux_valgrind_tests_5 = {
|
| - 'name': 'Linux Tests (valgrind)(5)',
|
| - 'builddir': 'chromium-rel-linux-valgrind-tests-5',
|
| - 'factory': f_chromium_rel_linux_valgrind,
|
| - 'category': '1Linux Valgrind|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_builder = {
|
| - 'name': 'Chromium OS Builder (valgrind)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-builder',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_builder,
|
| - 'category': '3ChromeOS Valgrind|compile',
|
| - 'auto_reboot': False,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_1 = {
|
| - 'name': 'Chromium OS (valgrind)(1)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-tests-1',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_tests_1,
|
| - 'category': '3ChromeOS Valgrind|compile|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_2 = {
|
| - 'name': 'Chromium OS (valgrind)(2)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-tests-2',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_tests_2,
|
| - 'category': '3ChromeOS Valgrind|compile|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_3 = {
|
| - 'name': 'Chromium OS (valgrind)(3)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-tests-3',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_tests_3,
|
| - 'category': '3ChromeOS Valgrind|compile|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_4 = {
|
| - 'name': 'Chromium OS (valgrind)(4)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-tests-4',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_tests_4,
|
| - 'category': '3ChromeOS Valgrind|compile|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_5 = {
|
| - 'name': 'Chromium OS (valgrind)(5)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-tests-5',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_tests_5,
|
| - 'category': '3ChromeOS Valgrind|compile|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| -b_chromium_rel_chromeos_valgrind_6 = {
|
| - 'name': 'Chromium OS (valgrind)(6)',
|
| - 'builddir': 'chromium-rel-chromeos-valgrind-tests-6',
|
| - 'factory': f_chromium_rel_chromeos_valgrind_tests_6,
|
| - 'category': '3ChromeOS Valgrind|compile|memory_tester',
|
| - 'auto_reboot': True,
|
| -}
|
| -
|
| b_chromium_rel_win_drmemory_builder = {
|
| 'name': 'Chromium Windows Builder (DrMemory)',
|
| # make the dir short for ninja build
|
| @@ -880,23 +624,6 @@ b_chromium_rel_linux_chromeos_msan = {
|
| }
|
|
|
|
|
| -c['builders'] = [
|
| - b_chromium_rel_linux_valgrind_builder,
|
| - b_chromium_rel_linux_valgrind_tests_1,
|
| - b_chromium_rel_linux_valgrind_tests_2,
|
| - b_chromium_rel_linux_valgrind_tests_3,
|
| - b_chromium_rel_linux_valgrind_tests_4,
|
| - b_chromium_rel_linux_valgrind_tests_5,
|
| -
|
| - b_chromium_rel_chromeos_valgrind_builder,
|
| - b_chromium_rel_chromeos_valgrind_1,
|
| - b_chromium_rel_chromeos_valgrind_2,
|
| - b_chromium_rel_chromeos_valgrind_3,
|
| - b_chromium_rel_chromeos_valgrind_4,
|
| - b_chromium_rel_chromeos_valgrind_5,
|
| - b_chromium_rel_chromeos_valgrind_6,
|
| -]
|
| -
|
| # DrMemory test bots
|
| b_win_drmemory = [
|
| b_chromium_rel_win_drmemory_builder,
|
| @@ -969,7 +696,7 @@ for i in range(WINDOWS_BROWSER_DRMEMORY_FULL_TESTERS):
|
| windows_browser_drmemory_full_tester(
|
| i + 1, WINDOWS_BROWSER_DRMEMORY_FULL_TESTERS))
|
|
|
| -c['builders'].extend(b_win_drmemory)
|
| +c['builders'] = b_win_drmemory
|
|
|
| c['builders'].extend([
|
| b_chromium_rel_linux_tsan_builder,
|
|
|