Bug 1165962 - Use 6 chunks for mochitest-devtools-chrome on linux/debug, r=jlund
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -458,16 +458,27 @@ MOCHITEST_DT_4 = [
'script_path': 'scripts/desktop_unittest.py',
'extra_args': ['--mochitest-suite', 'mochitest-devtools-chrome-chunked'],
'blob_upload': True,
'script_maxtime': 4800,
'totalChunks': 4,
}),
]
+MOCHITEST_DT_6 = [
+ ('mochitest-devtools-chrome', {
+ 'use_mozharness': True,
+ 'script_path': 'scripts/desktop_unittest.py',
+ 'extra_args': ['--mochitest-suite', 'mochitest-devtools-chrome-chunked'],
+ 'blob_upload': True,
+ 'script_maxtime': 4800,
+ 'totalChunks': 6,
+ }),
+]
+
MOCHITEST_BC_3 = [
('mochitest-browser-chrome', {
'use_mozharness': True,
'script_path': 'scripts/desktop_unittest.py',
'extra_args': ['--mochitest-suite', 'browser-chrome-chunked'],
'blob_upload': True,
'script_maxtime': 12000,
'totalChunks': 3,
@@ -1921,16 +1932,20 @@ BRANCHES['try']['platforms']['macosx64']
######## cedar
BRANCHES['cedar']['platforms']['linux64-asan']['ubuntu64-asan_vm']['opt_unittest_suites'] += MARIONETTE[:]
BRANCHES['cedar']['platforms']['win32']['xp-ix']['opt_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win32']['win7-ix']['opt_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win64']['win8_64']['opt_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win32']['xp-ix']['debug_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win32']['win7-ix']['debug_unittest_suites'] += REFTEST_OMTC[:]
BRANCHES['cedar']['platforms']['win64']['win8_64']['debug_unittest_suites'] += REFTEST_OMTC[:]
+# Bug 1165962 - use more chunks for devtools on linux32 debug
+debug_suites = BRANCHES['cedar']['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites']
+debug_suites = [x for x in debug_suites if x[0] and x[0] != 'mochitest-devtools-chrome']
+BRANCHES['cedar']['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites'] = debug_suites + MOCHITEST_DT_6[:]
loadSkipConfig(BRANCHES)
# Filter the tests that are enabled on holly for bug 985718.
for platform in BRANCHES['holly']['platforms'].keys():
if platform not in PLATFORMS:
continue