Only run performance tests if an about:config variable is set

pde · pde · commit ebb1ff97013d · 2014-01-17T21:29:18.000-08:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -441,7 +441,13 @@ const HTTPSRules = {
     }
     var t2 =  new Date().getTime();
     this.log(NOTE,"Loading rulesets took " + (t2 - t1) / 1000.0 + " seconds");
-    this.testRulesetRetrievalPerformance();
+    try {
+      if (HTTPSEverywhere.instance.prefs.getBoolPref("performance_tests")) {
+        this.testRulesetRetrievalPerformance();
+      }
+    } catch(e) {
+      this.log(WARN, "Explosion during testing " + e);
+    }
     return;
   },
 
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -9,10 +9,13 @@ pref("extensions.https_everywhere.dev_popup_shown", false);
 
 // show ruleset tests in the menu
 pref("extensions.https_everywhere.show_ruleset_tests", false);
+// run a ruleset performance test at startup
+pref("extensions.https_everywhere.performance_tests", false);
 
 // enable rulesets that trigger mixed content blocking
 pref("extensions.https_everywhere.enable_mixed_rulesets", false);
 
+
 // SSl Observatory preferences
 pref("extensions.https_everywhere._observatory.enabled",false);
 
