Frédéric Delanoy : msvcrt/tests: Use todo_wine_if() in tests.

[Alexandre Julliard]

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

Author: Frédéric Delanoy 
Date:   Fri Feb 19 15:49:52 2016 +0100

msvcrt/tests: Use todo_wine_if() in tests.

Signed-off-by: Frédéric Delanoy 
Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msvcrt/tests/cpp.c  | 6 ++----
 dlls/msvcrt/tests/misc.c | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c
index e3f7f99..490ddee 100644
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -1109,10 +1109,8 @@ static void test_demangle_datatype(void)
     for (i = 0; i < num_test; i++)
     {
    name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800);
-	if (demangle[i].test_in_wine)
-	    ok(name != NULL && !strcmp(name,demangle[i].result), "Got name "%s" for %d\n", name, i);
-	else
-	    todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i);
+        todo_wine_if (!demangle[i].test_in_wine)
+            ok(name != NULL && !strcmp(name,demangle[i].result), "Got name "%s" for %d\n", name, i);
         if(name)
             pfree(name);
     }
diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index 4968cbb..77f2873 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -181,14 +181,10 @@ static void test_I10_OUTPUT(void)
         ok(!strcmp(out.str, I10_OUTPUT_tests[i].out.str), "%d: out.str = %s\n", i, out.str);

j = strlen(I10_OUTPUT_tests[i].remain);
-        if(j && I10_OUTPUT_tests[i].remain[j-1]=='9')
-            todo_wine ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j),
-                    "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1);
-        else
+        todo_wine_if(j && I10_OUTPUT_tests[i].remain[j-1]=='9')
             ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j),
                     "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1);

-
         for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++)
             if(out.str[j] != '#')
                 ok(0, "%d: out.str[%d] = %c (expected '#')\n", i, j, out.str[j]);