Bug 1093691 - Part 3. Safeguard Mochitest, Reftest from e10s-on-nightly pref. r=gavin
authorFelipe Gomes <felipc@gmail.com>
Wed, 05 Nov 2014 02:15:16 -0200
changeset 214259 0c04ff1ef5a9749877b9cafc488f608647af01b3
parent 214258 800cc62253362942c076182ff54449354d50e624
child 214260 aad4ae442e009a4df22c92a46e1b4fb83ce9a945
push id27777
push usercbook@mozilla.com
push dateThu, 06 Nov 2014 12:50:56 +0000
treeherdermozilla-central@0c66a9fd9085 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs1093691
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1093691 - Part 3. Safeguard Mochitest, Reftest from e10s-on-nightly pref. r=gavin
layout/tools/reftest/runreftest.py
testing/profiles/prefs_general.js
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -215,16 +215,18 @@ class RefTest(object):
     # And for useragent updates.
     prefs['general.useragent.updates.enabled'] = False
     # And for webapp updates.  Yes, it is supposed to be an integer.
     prefs['browser.webapps.checkForUpdates'] = 0
     # And for about:newtab content fetch and pings.
     prefs['browser.newtabpage.directory.source'] = 'data:application/json,{"reftest":1}'
     prefs['browser.newtabpage.directory.ping'] = ''
 
+    #Don't use auto-enabled e10s
+    prefs['browser.tabs.remote.autostart.1'] = False
     if options.e10s:
       prefs['browser.tabs.remote.autostart'] = True
 
     for v in options.extraPrefs:
       thispref = v.split('=')
       if len(thispref) < 2:
         print "Error: syntax error in --setpref=" + v
         sys.exit(1)
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -261,8 +261,10 @@ user_pref("loop.CSP","default-src 'self'
 // Ensure UITour won't hit the network
 user_pref("browser.uitour.pinnedTabUrl", "http://%(server)s/uitour-dummy/pinnedTab");
 user_pref("browser.uitour.url", "http://%(server)s/uitour-dummy/tour");
 
 user_pref("media.eme.enabled", true);
 
 // Don't prompt about e10s
 user_pref("browser.displayedE10SPrompt.1", 5);
+// Don't use auto-enabled e10s
+user_pref("browser.tabs.remote.autostart.1", false);