Bug 1061014 - Enable e10s Linux opt browser chrome tests. f=rynavm, r=armenzg
authorJim Mathies <jmathies@mozilla.com>
Thu, 04 Sep 2014 14:03:19 -0500
changeset 10940 82429c54883f05416021d06e72e4eb98bcaf5a87
parent 10939 f6626c6101a8e5dff95caf2510eeabd26140f3dc
child 10941 d947a55a5e19e23be41dfc1707d968119ae8a8fa
push id8054
push userjmathies@mozilla.com
push dateThu, 04 Sep 2014 19:03:45 +0000
reviewersarmenzg
bugs1061014
Bug 1061014 - Enable e10s Linux opt browser chrome tests. f=rynavm, r=armenzg
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -419,16 +419,27 @@ MOCHITEST_BC_3 = [
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'browser-chrome-chunked'],
         'blob_upload': True,
         'script_maxtime': 12000,
         'totalChunks': 3,
     }),
 ]
 
+MOCHITEST_BC_3_E10S = [
+    ('mochitest-e10s-browser-chrome', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'browser-chrome-chunked', '--e10s'],
+        'blob_upload': True,
+        'script_maxtime': 12000,
+        'totalChunks': 3,
+    }),
+]
+
 MOCHITEST_PLAIN = MOCHITEST_WO_BC[:]
 MOCHITEST = MOCHITEST_WO_BC[:] + MOCHITEST_BC_3 + MOCHITEST_OTHER
 MOCHITEST_WO_BC += MOCHITEST_OTHER
 
 WEBAPPRT_CHROME = [
     ('webapprt-chrome', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
@@ -1939,23 +1950,23 @@ for platform in PLATFORMS.keys():
             BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOZBASE[:]
             BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOZBASE[:]
 
 # Enable e10s Linux mochitests on trunk branches
 # Fix this to a certain gecko version once e10s starts riding the trains
 mc_gecko_version = BRANCHES['mozilla-central']['gecko_version']
 for name, branch in items_at_least(BRANCHES, 'gecko_version', mc_gecko_version):
     if 'linux' in branch['platforms']:
-        branch['platforms']['linux']['ubuntu32_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:]
+        branch['platforms']['linux']['ubuntu32_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:] + MOCHITEST_BC_3_E10S[:]
         branch['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites'] += MOCHITEST_E10S[:]
     if 'linux64' in branch['platforms']:
-        branch['platforms']['linux64']['ubuntu64_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:]
+        branch['platforms']['linux64']['ubuntu64_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:] + MOCHITEST_BC_3_E10S[:]
         branch['platforms']['linux64']['ubuntu64_vm']['debug_unittest_suites'] += MOCHITEST_E10S[:]
     if 'linux64-asan' in branch['platforms']:
-        branch['platforms']['linux64-asan']['ubuntu64-asan_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:]
+        branch['platforms']['linux64-asan']['ubuntu64-asan_vm']['opt_unittest_suites'] += MOCHITEST_E10S[:] + MOCHITEST_BC_3_E10S[:]
 
 # 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