Austin English : mshtml: Mark tests that need wine-gecko as todo on arches without it.
Alexandre Julliard
julliard at winehq.org
Wed May 13 16:29:55 CDT 2020
Module: wine
Branch: master
Commit: 88faa9e152c8abeaf5ba36e099e131ea720eaa6a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=88faa9e152c8abeaf5ba36e099e131ea720eaa6a
Author: Austin English <austinenglish at gmail.com>
Date: Wed May 13 08:33:54 2020 +0000
mshtml: Mark tests that need wine-gecko as todo on arches without it.
Signed-off-by: Austin English <austinenglish at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/tests/events.c | 6 ++++++
dlls/mshtml/tests/htmldoc.c | 6 ++++++
dlls/mshtml/tests/htmllocation.c | 3 +++
dlls/mshtml/tests/script.c | 6 ++++++
dlls/mshtml/tests/style.c | 3 +++
dlls/mshtml/tests/xmlhttprequest.c | 3 +++
6 files changed, 27 insertions(+)
diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c
index 8bbdb39205..cf6018687e 100644
--- a/dlls/mshtml/tests/events.c
+++ b/dlls/mshtml/tests/events.c
@@ -3319,6 +3319,9 @@ static IHTMLDocument2 *create_document(void)
hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IHTMLDocument2, (void**)&doc);
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres);
return SUCCEEDED(hres) ? doc : NULL;
}
@@ -3489,6 +3492,9 @@ START_TEST(events)
DestroyWindow(container_hwnd);
}else {
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
win_skip("Too old IE\n");
}
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index e473ee0f21..dee448144e 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -7290,6 +7290,9 @@ static IHTMLDocument2 *create_document(void)
hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IHTMLDocument2, (void**)&doc);
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres);
if(FAILED(hres))
return NULL;
@@ -8774,6 +8777,9 @@ START_TEST(htmldoc)
if(!check_ie()) {
CoUninitialize();
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
win_skip("Too old IE\n");
return;
}
diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c
index 0b1db9d2c7..cec69e4414 100644
--- a/dlls/mshtml/tests/htmllocation.c
+++ b/dlls/mshtml/tests/htmllocation.c
@@ -302,6 +302,9 @@ static void perform_test(const struct location_test* test)
hres = CoCreateInstance(&CLSID_HTMLDocument, NULL,
CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2,
(void**)&doc);
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
ok(hres == S_OK, "%s: CoCreateInstance failed: 0x%08x\n", test->name, hres);
if(FAILED(hres)){
IMoniker_Release(url_mon);
diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c
index 38fd0b4e8a..749ec21607 100644
--- a/dlls/mshtml/tests/script.c
+++ b/dlls/mshtml/tests/script.c
@@ -1231,6 +1231,9 @@ static IHTMLDocument2 *create_document(void)
hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IHTMLDocument2, (void**)&doc);
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres);
return SUCCEEDED(hres) ? doc : NULL;
}
@@ -3572,6 +3575,9 @@ START_TEST(script)
skip("IE running in Enhanced Security Configuration\n");
}
}else {
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
win_skip("Too old IE.\n");
}
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 3d2c7e27c2..d79d1bef06 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -3496,6 +3496,9 @@ static IHTMLDocument2 *create_document(void)
hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IHTMLDocument2, (void**)&doc);
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres);
if(FAILED(hres))
return NULL;
diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c
index 9280246b3c..9fafb7afc6 100644
--- a/dlls/mshtml/tests/xmlhttprequest.c
+++ b/dlls/mshtml/tests/xmlhttprequest.c
@@ -1021,6 +1021,9 @@ static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url)
hres = CoCreateInstance(&CLSID_HTMLDocument, NULL,
CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2,
(void**)&doc);
+#if !defined(__i386__) && !defined(__x86_64__)
+ todo_wine
+#endif
ok(hres == S_OK, "CoCreateInstance failed: 0x%08x\n", hres);
hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker,
More information about the wine-cvs
mailing list