зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1452957 - reftests should support preferences with Unicode strings. r=gbrown
Switching from {get|set}CharPref to {get|set}StringPref allows the reftest extension to also support preferences with Unicode strings. MozReview-Commit-ID: FUBjhmr0VIS --HG-- extra : rebase_source : 53e1a020f8e2875c35ce1dfc06aff41ea18ce127
This commit is contained in:
Родитель
844cc57fa0
Коммит
68abd19c16
|
@ -163,7 +163,7 @@ function OnRefTestLoad(win)
|
|||
|
||||
g.browserIsIframe = prefs.getBoolPref("reftest.browser.iframe.enabled", false);
|
||||
|
||||
g.logLevel = prefs.getCharPref("reftest.logLevel", "info");
|
||||
g.logLevel = prefs.getStringPref("reftest.logLevel", "info");
|
||||
|
||||
if (win === undefined || win == null) {
|
||||
win = window;
|
||||
|
@ -237,7 +237,7 @@ function InitAndStartRefTests()
|
|||
|
||||
/* Get the logfile for android tests */
|
||||
try {
|
||||
var logFile = prefs.getCharPref("reftest.logFile");
|
||||
var logFile = prefs.getStringPref("reftest.logFile");
|
||||
if (logFile) {
|
||||
var f = FileUtils.File(logFile);
|
||||
g.logFile = FileUtils.openFileOutputStream(f, FileUtils.MODE_WRONLY | FileUtils.MODE_CREATE);
|
||||
|
@ -259,7 +259,7 @@ function InitAndStartRefTests()
|
|||
}
|
||||
|
||||
try {
|
||||
g.focusFilterMode = prefs.getCharPref("reftest.focusFilterMode");
|
||||
g.focusFilterMode = prefs.getStringPref("reftest.focusFilterMode");
|
||||
} catch(e) {}
|
||||
|
||||
try {
|
||||
|
@ -353,9 +353,9 @@ function ReadTests() {
|
|||
* The latter two modes are used to pass test data back and forth
|
||||
* with python harness.
|
||||
*/
|
||||
let manifests = prefs.getCharPref("reftest.manifests", null);
|
||||
let dumpTests = prefs.getCharPref("reftest.manifests.dumpTests", null);
|
||||
let testList = prefs.getCharPref("reftest.tests", null);
|
||||
let manifests = prefs.getStringPref("reftest.manifests", null);
|
||||
let dumpTests = prefs.getStringPref("reftest.manifests.dumpTests", null);
|
||||
let testList = prefs.getStringPref("reftest.tests", null);
|
||||
|
||||
if ((testList && manifests) || !(testList || manifests)) {
|
||||
logger.error("Exactly one of reftest.manifests or reftest.tests must be specified.");
|
||||
|
@ -500,7 +500,7 @@ function StartTests()
|
|||
var ids = g.urls.map(function(obj) {
|
||||
return obj.identifier;
|
||||
});
|
||||
var suite = prefs.getCharPref('reftest.suite', 'reftest');
|
||||
var suite = prefs.getStringPref('reftest.suite', 'reftest');
|
||||
logger.suiteStart(ids, suite, {"skipped": g.urls.length - numActiveTests});
|
||||
g.suiteStarted = true
|
||||
}
|
||||
|
@ -672,7 +672,7 @@ function StartCurrentURI(aURLTargetType)
|
|||
}
|
||||
} else if (ps.type == PREF_STRING) {
|
||||
try {
|
||||
oldVal = prefs.getCharPref(ps.name);
|
||||
oldVal = prefs.getStringPref(ps.name);
|
||||
} catch (e) {
|
||||
badPref = "string preference '" + ps.name + "'";
|
||||
throw "bad pref";
|
||||
|
@ -695,7 +695,7 @@ function StartCurrentURI(aURLTargetType)
|
|||
if (ps.type == PREF_BOOLEAN) {
|
||||
prefs.setBoolPref(ps.name, value);
|
||||
} else if (ps.type == PREF_STRING) {
|
||||
prefs.setCharPref(ps.name, value);
|
||||
prefs.setStringPref(ps.name, value);
|
||||
value = '"' + value + '"';
|
||||
} else if (ps.type == PREF_INTEGER) {
|
||||
prefs.setIntPref(ps.name, value);
|
||||
|
@ -1364,7 +1364,7 @@ function RestoreChangedPreferences()
|
|||
if (ps.type == PREF_BOOLEAN) {
|
||||
prefs.setBoolPref(ps.name, value);
|
||||
} else if (ps.type == PREF_STRING) {
|
||||
prefs.setCharPref(ps.name, value);
|
||||
prefs.setStringPref(ps.name, value);
|
||||
value = '"' + value + '"';
|
||||
} else if (ps.type == PREF_INTEGER) {
|
||||
prefs.setIntPref(ps.name, value);
|
||||
|
|
Загрузка…
Ссылка в новой задаче