| Index: masters/master.chromium.fyi/master.cfg
|
| diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg
|
| index d0802485b0a1d3ee9b86a15b3ff86850a0b67fe5..7485adf289e9e107c071840f842e0f803e15ce6b 100644
|
| --- a/masters/master.chromium.fyi/master.cfg
|
| +++ b/masters/master.chromium.fyi/master.cfg
|
| @@ -126,7 +126,7 @@ s_chromium = Scheduler(
|
| 'Chromium Vista Memory',
|
| 'Chromium Linux Memory',
|
| 'Chromium Mac Memory',
|
| - 'Chromium Linux Redux',
|
| + 'Chromium Linux OpenSSL',
|
| 'Linux ARM Cross-Compile',
|
| 'Android Builder (dbg)',
|
| 'Android User Builder Tests',
|
| @@ -635,7 +635,7 @@ f_cr_dbg_frame = win_build().ChromiumFactory(
|
| factory_properties={'process_dumps': True,
|
| 'start_crash_handler': True,})
|
|
|
| -f_chromium_linux_redux = linux().ChromiumFactory(
|
| +f_chromium_linux_openssl = linux().ChromiumFactory(
|
| tests=[
|
| 'base_unittests',
|
| 'cacheinvalidation_unittests',
|
| @@ -664,17 +664,7 @@ f_chromium_linux_redux = linux().ChromiumFactory(
|
| 'unit_tests',
|
| 'url_unittests',
|
| ],
|
| - factory_properties={
|
| - 'gclient_env': {
|
| - 'GYP_DEFINES': ('linux_fpic=1 '
|
| - 'enable_touch_events=1 '
|
| - 'disable_nacl=1 '
|
| - 'linux_use_tcmalloc=0 '
|
| - 'linux_breakpad=0 '
|
| - 'remoting=0 '
|
| - 'configuration_policy=0 '
|
| - 'safe_browsing=0 '
|
| - 'use_openssl=1')}})
|
| + factory_properties={'gclient_env': {'GYP_DEFINES': ('use_openssl=1')}})
|
|
|
| f_chromium_dbg_win_drmemory = win_build().ChromiumFactory(
|
| slave_type='Tester',
|
| @@ -1602,9 +1592,9 @@ b_chromium_rel_win8_tests_2 = {
|
| 'auto_reboot': False,
|
| }
|
|
|
| -b_chromium_linux_redux = {
|
| - 'name': 'Chromium Linux Redux',
|
| - 'factory': f_chromium_linux_redux,
|
| +b_chromium_linux_openssl = {
|
| + 'name': 'Chromium Linux OpenSSL',
|
| + 'factory': f_chromium_linux_openssl,
|
| 'category': 'linux',
|
| 'auto_reboot': False,
|
| }
|
| @@ -2149,7 +2139,7 @@ c['builders'] = [
|
| b_chromium_mac_10_8_buildrunner,
|
|
|
| # Linux BuilderTesters
|
| - b_chromium_linux_redux,
|
| + b_chromium_linux_openssl,
|
| b_chromium_rel_linux_valgrind_reliability,
|
| b_chromium_linux_goma_canary,
|
| b_chromium_linux_goma_linktest,
|
|
|