Jactry Zeng : mlang/tests: Simplify test with todo_wine_if.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Feb 16 09:55:00 CST 2016


Module: wine
Branch: master
Commit: 25d999d965a9f3eff6391134714e84b9c3af30ed
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=25d999d965a9f3eff6391134714e84b9c3af30ed

Author: Jactry Zeng <jzeng at codeweavers.com>
Date:   Tue Feb 16 16:22:17 2016 +0800

mlang/tests: Simplify test with todo_wine_if.

Signed-off-by: Jactry Zeng <jzeng at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mlang/tests/mlang.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 0078f6e..14da21e 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1216,8 +1216,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2)
             short_broken_name[MAX_LOCALE_NAME - 2] = 0;
         }
 
-        if (info_table[i].todo & TODO_NAME) {
-            todo_wine
+        todo_wine_if (info_table[i].todo & TODO_NAME) {
             ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
                (info_table[i].broken_name && (
                 broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
@@ -1225,14 +1224,6 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2)
                 "#%02d: got %s (expected %s)\n", i,
                 wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));
         }
-        else
-            ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
-               (info_table[i].broken_name && (
-                broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
-                broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)))),
-                "#%02d: got %s (expected %s)\n", i,
-                wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));
-
     }
 
     /* SUBLANG_NEUTRAL only allowed for English, Arabic, Chinese */




More information about the wine-cvs mailing list