From db7de123453a38e739c7c1bbd58d8a70dcad0291 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 13 Feb 2014 20:09:59 +0000 Subject: [PATCH] [XMLLITE_WINETEST] * Globally mark expected failures as todos instead of failures. ROSTESTS-128 svn path=/trunk/; revision=62148 --- rostests/winetests/xmllite/CMakeLists.txt | 2 ++ rostests/winetests/xmllite/reader.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rostests/winetests/xmllite/CMakeLists.txt b/rostests/winetests/xmllite/CMakeLists.txt index 7bb8b287e61..2d3b66bd480 100644 --- a/rostests/winetests/xmllite/CMakeLists.txt +++ b/rostests/winetests/xmllite/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-DUSE_WINE_TODOS) + list(APPEND SOURCE reader.c writer.c diff --git a/rostests/winetests/xmllite/reader.c b/rostests/winetests/xmllite/reader.c index 939e8308a50..ed3d6e1652f 100644 --- a/rostests/winetests/xmllite/reader.c +++ b/rostests/winetests/xmllite/reader.c @@ -112,7 +112,7 @@ static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, (pos_broken == -1 ? pos : pos_broken) == p); if (todo) - todo_ros + todo_wine ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); else @@ -761,7 +761,7 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_Read(reader, &type); /* newer versions return syntax error here cause document is incomplete, it makes more sense than invalid char error */ -todo_ros { +todo_wine { ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); } @@ -1405,7 +1405,7 @@ static void test_read_cdata(void) str_exp = a2w(test->value); if (test->todo) { - todo_ros { + todo_wine { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); } @@ -1643,7 +1643,7 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_ros { + todo_wine { ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));