ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Include URL pathname and query in test traces. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-07-01 15:30:49 +02:00 committed by Alexandre Julliard
parent 2eb40fab19
commit 3ea7ef4098
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/mshtml/tests/script.c
View File

@ -3405,7 +3405,7 @@ static void run_from_path(const char *path, const char *opt)
strcat(buf, path); strcat(buf, path);
if(opt) if(opt)
strcat(buf, opt); sprintf(buf + strlen(buf), "?%s", opt);
url = a2bstr(buf); url = a2bstr(buf);
hres = CreateURLMoniker(NULL, url, &mon); hres = CreateURLMoniker(NULL, url, &mon);
SysFreeString(url); SysFreeString(url);
@ -3437,7 +3437,7 @@ static void run_script_as_http_with_mode(const char *script, const char *opt, co
document_mode ? "\">" : "", document_mode ? "\">" : "",
script); script);
run_from_path("/index.html", opt); run_from_path("/index.html", opt ? opt : script);
} }
static void init_protocol_handler(void) static void init_protocol_handler(void)
@ -3481,15 +3481,15 @@ static void run_js_tests(void)
run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, NULL);
run_script_as_http_with_mode("navigation.js", NULL, "11"); run_script_as_http_with_mode("navigation.js", NULL, "11");
run_script_as_http_with_mode("documentmode.js", "?0", NULL); run_script_as_http_with_mode("documentmode.js", "0", NULL);
run_script_as_http_with_mode("documentmode.js", "?5", "5"); run_script_as_http_with_mode("documentmode.js", "5", "5");
run_script_as_http_with_mode("documentmode.js", "?5", "6"); run_script_as_http_with_mode("documentmode.js", "5", "6");
run_script_as_http_with_mode("documentmode.js", "?7", "7"); run_script_as_http_with_mode("documentmode.js", "7", "7");
run_script_as_http_with_mode("documentmode.js", "?8", "8"); run_script_as_http_with_mode("documentmode.js", "8", "8");
run_script_as_http_with_mode("documentmode.js", "?9", "9"); run_script_as_http_with_mode("documentmode.js", "9", "9");
run_script_as_http_with_mode("documentmode.js", "?10", "10"); run_script_as_http_with_mode("documentmode.js", "10", "10");
run_script_as_http_with_mode("documentmode.js", "?11", "11"); run_script_as_http_with_mode("documentmode.js", "11", "11");
run_script_as_http_with_mode("documentmode.js", "?11", "edge"); run_script_as_http_with_mode("documentmode.js", "11", "edge");
run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9");
} }

15
dlls/mshtml/tests/winetest.js
View File

@ -42,11 +42,11 @@ function run_tests() {
} }
function ok(b,m) { function ok(b,m) {
return external.ok(b, m); return external.ok(b, format_message(m));
} }
function trace(m) { function trace(m) {
external.trace(m); external.trace(format_message(m));
} }
function win_skip(m) { function win_skip(m) {
@ -59,10 +59,19 @@ function reportSuccess() {
var todo_wine = { var todo_wine = {
ok: function(b,m) { ok: function(b,m) {
return external.todo_wine_ok(b,m); return external.todo_wine_ok(b, format_message(m));
} }
}; };
function todo_wine_if(expr) { function todo_wine_if(expr) {
return expr ? todo_wine : { ok: ok }; return expr ? todo_wine : { ok: ok };
} }
var file_prefix = document.location.pathname;
if(document.location.search)
file_prefix += document.location.search;
file_prefix += ": ";
function format_message(msg) {
return file_prefix + msg;
}