Module: wine Branch: master Commit: cdda92fc4ef7e674f2167d581dec3f7ed0a2918c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdda92fc4ef7e674f2167d581d...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Feb 10 13:41:47 2016 +0300
msxml3/tests: Simplify a couple of tests using todo_wine_if().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msxml3/tests/saxreader.c | 4 +--- dlls/msxml3/tests/schema.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 88b2404..9c8d103 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2867,9 +2867,7 @@ static void test_saxreader_encoding(void) CloseHandle(file);
hr = ISAXXMLReader_parseURL(reader, testXmlW); - if (entry->todo) - todo_wine ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); - else + todo_wine_if(entry->todo) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid);
DeleteFileA(testXmlA); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index bfedb8b..43ddc3c 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1322,10 +1322,7 @@ static void test_XDR_datatypes(void) hr = IXMLDOMNode_get_nodeTypedValue(node, &v); EXPECT_HR(hr, S_OK);
- if (ptr->todo) - todo_wine - ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); - else + todo_wine_if(ptr->todo) ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v));
switch (ptr->type_schema)