[PATCH] handle gecko not installed

Marcus Meissner marcus at jet.franken.de
Sat Oct 6 08:29:51 CDT 2007


This handles failures on "wine" testplatform
with Gecko not installed.

The testplatform checks might be more generic.

Ciao, Marcus
---
 dlls/mshtml/tests/dom.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index fefe054..01d3166 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -114,8 +114,14 @@ static void test_doc_elem(IHTMLDocument2 *doc)
 
     hres = IHTMLDocument3_get_documentElement(doc3, &elem);
     IHTMLDocument3_Release(doc3);
+    /* only allow failure on Wine */
+    if (!strcmp(winetest_platform,"wine")) {
+	if (hres != S_OK) {
+	    skip("Document Element tests\n");
+	    return;
+	}
+    }
     ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);
-
     test_node_name((IUnknown*)elem, "HTML");
     test_elem_tag((IUnknown*)elem, "HTML");
 
@@ -240,6 +246,13 @@ static void test_txtrange(IHTMLDocument2 *doc)
     HRESULT hres;
 
     hres = IHTMLDocument2_get_body(doc, &elem);
+    /* only allow failure on Wine */
+    if (!strcmp(winetest_platform,"wine")) {
+	if (hres != S_OK) {
+	    skip("TXTRange tests\n");
+	    return;
+	}
+    }
     ok(hres == S_OK, "get_body failed: %08x\n", hres);
 
     hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body);
@@ -461,6 +474,13 @@ static void test_defaults(IHTMLDocument2 *doc)
     HRESULT hres;
 
     hres = IHTMLDocument2_get_body(doc, &elem);
+    /* only allow failure on Wine */
+    if (!strcmp(winetest_platform,"wine")) {
+	if (hres != S_OK) {
+	    skip("Documents2 get_body tests\n");
+	    return;
+	}
+    }
     ok(hres == S_OK, "get_body failed: %08x\n", hres);
 
     hres = IHTMLElement_get_style(elem, &style);
-- 
1.5.2.4



More information about the wine-patches mailing list