Bug 1160085 - Update to latest wptrunner, a=testonly

This commit is contained in:
James Graham 2015-04-30 11:26:56 +01:00
parent 89a40f3184
commit 05888d4444
2 changed files with 6 additions and 6 deletions

View File

@ -157,20 +157,19 @@ class MarionetteProtocol(Protocol):
let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
let pref = '%s';
let value = '%s';
let type = prefInterface.getPrefType(pref);
switch(type) {
case prefInterface.PREF_STRING:
prefInterface.setCharPref(pref, value);
prefInterface.setCharPref(pref, '%s');
break;
case prefInterface.PREF_BOOL:
prefInterface.setBoolPref(pref, value);
prefInterface.setBoolPref(pref, %s);
break;
case prefInterface.PREF_INT:
prefInterface.setIntPref(pref, value);
prefInterface.setIntPref(pref, %s);
break;
}
""" % (name, value)
""" % (name, value, value, value)
self.marionette.execute_script(script)
self.marionette.set_context(self.marionette.CONTEXT_CONTENT)

View File

@ -186,7 +186,8 @@ class ServoRefTestExecutor(ProcessTestExecutor):
with TempFilename(self.tempdir) as output_path:
self.command = [self.binary, "--cpu", "--hard-fail", "--exit",
"--output=%s" % output_path, full_url]
"-Z", "disable-text-aa", "--output=%s" % output_path,
full_url]
env = os.environ.copy()
env["HOST_FILE"] = self.hosts_path