Bug 1022785 - Disable android snippets for reftests/crashtests/jsreftests. r=jmaher, a=test-only
authorNathan Froyd <froydnj@mozilla.com>
Mon, 09 Jun 2014 13:37:21 -0400
changeset 148986 6521c72564e1a917c862c4ca4e01fd439a84132c
parent 148985 26bf6fc63018f0541d31804961c41a8ac9056d13
child 148987 4d29d060b4b7f35791221faad820d6d50b22da08
push id266
push userryanvm@gmail.com
push dateFri, 13 Jun 2014 15:58:51 +0000
reviewersjmaher, test-only
bugs1022785
milestone24.6.0
Bug 1022785 - Disable android snippets for reftests/crashtests/jsreftests. r=jmaher, a=test-only
js/src/tests/user.js
layout/tools/reftest/runreftest.py
--- a/js/src/tests/user.js
+++ b/js/src/tests/user.js
@@ -24,8 +24,10 @@ user_pref("extensions.checkUpdateSecurit
 user_pref("browser.EULA.override", true);
 user_pref("javascript.options.strict", false);
 user_pref("javascript.options.werror", false);
 user_pref("toolkit.startup.max_resumed_crashes", -1);
 user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
 user_pref("toolkit.telemetry.enabled", false);
 user_pref("browser.safebrowsing.enabled", false);
 user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.snippets.enabled", false);
+user_pref("browser.snippets.syncPromo.enabled", false);
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -72,16 +72,19 @@ class RefTest(object):
     prefsFile.write('user_pref("reftest.focusFilterMode", %s);\n' % self.makeJSString(options.focusFilterMode))
 
     # Ensure that telemetry is disabled, so we don't connect to the telemetry
     # server in the middle of the tests.
     prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n')
     # Likewise for safebrowsing.
     prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n')
     prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n')
+    # And for snippets.
+    prefsFile.write('user_pref("browser.snippets.enabled", false);\n')
+    prefsFile.write('user_pref("browser.snippets.syncPromo.enabled", false);\n')
 
     for v in options.extraPrefs:
       thispref = v.split("=")
       if len(thispref) < 2:
         print "Error: syntax error in --setpref=" + v
         sys.exit(1)
       part = 'user_pref("%s", %s);\n' % (thispref[0], thispref[1])
       prefsFile.write(part)