mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-25 20:01:50 +00:00
Bug 1018436 - Fix import script problem on Windows, r=mdas
This commit is contained in:
parent
252a891943
commit
4425c0a156
testing/marionette
@ -495,6 +495,7 @@ function executeScript(msg, directInject) {
|
||||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
stream.init(importedScripts, -1, 0, 0);
|
||||
let data = NetUtil.readInputStreamToString(stream, stream.available());
|
||||
stream.close();
|
||||
script = data + script;
|
||||
}
|
||||
let res = Cu.evalInSandbox(script, sandbox, "1.8", "dummy file" ,0);
|
||||
@ -526,6 +527,7 @@ function executeScript(msg, directInject) {
|
||||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
stream.init(importedScripts, -1, 0, 0);
|
||||
let data = NetUtil.readInputStreamToString(stream, stream.available());
|
||||
stream.close();
|
||||
script = data + script;
|
||||
}
|
||||
let res = Cu.evalInSandbox(script, sandbox, "1.8", "dummy file", 0);
|
||||
@ -662,6 +664,7 @@ function executeWithCallback(msg, useFinish) {
|
||||
createInstance(Ci.nsIFileInputStream);
|
||||
stream.init(importedScripts, -1, 0, 0);
|
||||
let data = NetUtil.readInputStreamToString(stream, stream.available());
|
||||
stream.close();
|
||||
scriptSrc = data + scriptSrc;
|
||||
}
|
||||
Cu.evalInSandbox(scriptSrc, sandbox, "1.8", "dummy file", 0);
|
||||
|
@ -716,6 +716,7 @@ MarionetteServerConnection.prototype = {
|
||||
createInstance(Ci.nsIFileInputStream);
|
||||
stream.init(this.importedScripts, -1, 0, 0);
|
||||
let data = NetUtil.readInputStreamToString(stream, stream.available());
|
||||
stream.close();
|
||||
script = data + script;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user