Bug 1027541 - Reconfigure elm for linux* builds only, and all tests. r=nthomas
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1655,28 +1655,16 @@ for platform in PLATFORMS.keys():
# Enable e10s Linux mochitests on main branches
for name, branch in items_at_least(BRANCHES, 'gecko_version', 31):
if 'linux' in branch['platforms']:
branch['platforms']['linux']['ubuntu32_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:]
if 'linux64' in branch['platforms']:
branch['platforms']['linux64']['ubuntu64_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:]
-# Filter the tests that are enabled on elm for bug 1006717.
-for platform in BRANCHES['elm']['platforms'].keys():
- if platform not in PLATFORMS:
- continue
-
- for slave_platform in PLATFORMS[platform]['slave_platforms']:
- if slave_platform not in BRANCHES['elm']['platforms'][platform]:
- continue
- slave_p = BRANCHES['elm']['platforms'][platform][slave_platform]
- slave_p['opt_unittest_suites'] = MOCHITEST + XPCSHELL + MOCHITEST_DT
- slave_p['debug_unittest_suites'] = MOCHITEST + XPCSHELL + MARIONETTE + MOCHITEST_DT_3
-
# TALOS: If you set 'talos_slave_platforms' for a branch you will only get that subset of platforms
for branch in BRANCHES.keys():
for os in PLATFORMS.keys(): # 'macosx64', 'win32' and on
if os not in BRANCHES[branch]['platforms'].keys():
continue
if BRANCHES[branch]['platforms'][os].get('talos_slave_platforms') is None:
continue
platforms_for_os = get_talos_slave_platforms(PLATFORMS, platforms=(os,))
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -162,28 +162,24 @@ PROJECT_BRANCHES = {
'win64-debug': {
'enable_debug_unittests': True,
},
},
'enable_merging': False,
},
'elm': {
'branch_projects': [],
- 'enable_talos': False,
+ 'enable_talos': True,
'enable_valgrind': False,
'lock_platforms': True,
'platforms': {
'linux': {},
'linux64': {},
- 'win32': {},
- 'macosx64': {},
'linux-debug': {},
'linux64-debug': {},
- 'macosx64-debug': {},
- 'win32-debug': {},
},
},
'fig': {
'lock_platforms': True,
'platforms': {
'linux64-mulet': {},
}
},