Bug 1269872 - remove --disable-e10s and use --e10s. r=armenzg
authorJoel Maher <jmaher@mozilla.com>
Tue, 17 May 2016 11:17:24 -0400 (2016-05-17)
changeset 14220 10b8e6c3c984c5b5ba5fd1fea3104b65c52254ae
parent 14219 c6b4172b5b962ef003d864e76a97658910bac87c
child 14221 e2b015fe1d6facf9cca522f3fb15dcfb3d675f7b
push id9975
push userjmaher@mozilla.com
push dateTue, 17 May 2016 15:17:35 +0000 (2016-05-17)
reviewersarmenzg
bugs1269872
Bug 1269872 - remove --disable-e10s and use --e10s. r=armenzg MozReview-Commit-ID: F5e4bWFdJkS
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -667,52 +667,52 @@ MOCHITEST_WEBGL_E10S = [
     }),
 ]
 
 MOCHITEST_GPU = [
     ('mochitest-gpu', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite',
-                       'plain-gpu,chrome-gpu,browser-chrome-gpu',
-                       '--disable-e10s'],
+                       'plain-gpu,chrome-gpu,browser-chrome-gpu'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
 MOCHITEST_GPU_E10S = [
     ('mochitest-gpu-e10s', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite',
-                       'plain-gpu,chrome-gpu,browser-chrome-gpu'],
+                       'plain-gpu,chrome-gpu,browser-chrome-gpu',
+                       '--e10s'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
 MOCHITEST_CLIPBOARD = [
     ('mochitest-clipboard', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite',
-                       'plain-clipboard,chrome-clipboard,browser-chrome-clipboard,jetpack-package-clipboard',
-                       '--disable-e10s'],
+                       'plain-clipboard,chrome-clipboard,browser-chrome-clipboard,jetpack-package-clipboard'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
 MOCHITEST_CLIPBOARD_E10S = [
     ('mochitest-clipboard-e10s', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite',
-                       'plain-clipboard,chrome-clipboard,browser-chrome-clipboard,jetpack-package-clipboard'],
+                       'plain-clipboard,chrome-clipboard,browser-chrome-clipboard,jetpack-package-clipboard',
+                       '--e10s'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
 ### Mochitest Combinations ###
 MOCHITEST = MOCHITEST_WO_BC + MOCHITEST_OTHER