mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 857715: In testing/xpcshell/head.js, use 'uneval' to quote values passed to the child process. r=ted
This commit is contained in:
parent
a8833344c1
commit
b615271c9e
@ -977,28 +977,21 @@ function do_load_child_test_harness()
|
||||
if (typeof do_load_child_test_harness.alreadyRun != "undefined")
|
||||
return;
|
||||
do_load_child_test_harness.alreadyRun = 1;
|
||||
|
||||
function addQuotes (str) {
|
||||
return '"' + str + '"';
|
||||
}
|
||||
var quoted_head_files = _HEAD_FILES.map(addQuotes);
|
||||
var quoted_tail_files = _TAIL_FILES.map(addQuotes);
|
||||
|
||||
_XPCSHELL_PROCESS = "parent";
|
||||
|
||||
let command =
|
||||
"const _HEAD_JS_PATH='" + _HEAD_JS_PATH + "'; "
|
||||
+ "const _HTTPD_JS_PATH='" + _HTTPD_JS_PATH + "'; "
|
||||
+ "const _HEAD_FILES=[" + quoted_head_files.join() + "];"
|
||||
+ "const _TAIL_FILES=[" + quoted_tail_files.join() + "];"
|
||||
"const _HEAD_JS_PATH=" + uneval(_HEAD_JS_PATH) + "; "
|
||||
+ "const _HTTPD_JS_PATH=" + uneval(_HTTPD_JS_PATH) + "; "
|
||||
+ "const _HEAD_FILES=" + uneval(_HEAD_FILES) + "; "
|
||||
+ "const _TAIL_FILES=" + uneval(_TAIL_FILES) + "; "
|
||||
+ "const _XPCSHELL_PROCESS='child';";
|
||||
|
||||
if (this._TESTING_MODULES_DIR) {
|
||||
normalized = this._TESTING_MODULES_DIR.replace('\\', '\\\\', 'g');
|
||||
command += "const _TESTING_MODULES_DIR='" + normalized + "'; ";
|
||||
command += " const _TESTING_MODULES_DIR=" + uneval(_TESTING_MODULES_DIR) + ";";
|
||||
}
|
||||
|
||||
command += "load(_HEAD_JS_PATH);";
|
||||
command += " load(_HEAD_JS_PATH);";
|
||||
|
||||
sendCommand(command);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user