ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp120/tests: Simplify tests by using todo_wine_if. 

Signed-off-by: YongHao Hu <christopherwuy@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
YongHao Hu 2016-02-19 00:44:37 +08:00 committed by Alexandre Julliard
parent d0b88e7454
commit 43bcc0d597
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/msvcp120/tests/msvcp120.c
View File

@ -966,14 +966,9 @@ static void test_tr2_sys__Copy_file(void)
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {
errno = 0xdeadbeef; errno = 0xdeadbeef;
ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists);
if(tests[i].is_todo) todo_wine_if(tests[i].is_todo)
todo_wine ok(ret == tests[i].last_error || ret == tests[i].last_error2,
"test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n",
i+1, tests[i].last_error, ret);
else
ok(ret == tests[i].last_error || ret == tests[i].last_error2, ok(ret == tests[i].last_error || ret == tests[i].last_error2,
"test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret);
i+1, tests[i].last_error, ret);
ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno);
if(ret == ERROR_SUCCESS) if(ret == ERROR_SUCCESS)
ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest),
@ -1166,10 +1161,7 @@ static void test_tr2_sys__Stat(void)
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {
err_code = 0xdeadbeef; err_code = 0xdeadbeef;
val = p_tr2_sys__Stat(tests[i].path, &err_code); val = p_tr2_sys__Stat(tests[i].path, &err_code);
if(tests[i].is_todo) todo_wine_if(tests[i].is_todo)
todo_wine ok(tests[i].ret == val, "tr2_sys__Stat(): test %d expect: %d, got %d\n",
i+1, tests[i].ret, val);
else
ok(tests[i].ret == val, "tr2_sys__Stat(): test %d expect: %d, got %d\n", i+1, tests[i].ret, val); ok(tests[i].ret == val, "tr2_sys__Stat(): test %d expect: %d, got %d\n", i+1, tests[i].ret, val);
ok(tests[i].err_code == err_code, "tr2_sys__Stat(): test %d err_code expect: %d, got %d\n", ok(tests[i].err_code == err_code, "tr2_sys__Stat(): test %d err_code expect: %d, got %d\n",
i+1, tests[i].err_code, err_code); i+1, tests[i].err_code, err_code);
@ -1177,12 +1169,8 @@ static void test_tr2_sys__Stat(void)
/* test tr2_sys__Lstat */ /* test tr2_sys__Lstat */
err_code = 0xdeadbeef; err_code = 0xdeadbeef;
val = p_tr2_sys__Lstat(tests[i].path, &err_code); val = p_tr2_sys__Lstat(tests[i].path, &err_code);
if(tests[i].is_todo) todo_wine_if(tests[i].is_todo)
todo_wine ok(tests[i].ret == val, "tr2_sys__Lstat(): test %d expect: %d, got %d\n",
i+1, tests[i].ret, val);
else
ok(tests[i].ret == val, "tr2_sys__Lstat(): test %d expect: %d, got %d\n", i+1, tests[i].ret, val); ok(tests[i].ret == val, "tr2_sys__Lstat(): test %d expect: %d, got %d\n", i+1, tests[i].ret, val);
ok(tests[i].err_code == err_code, "tr2_sys__Lstat(): test %d err_code expect: %d, got %d\n", ok(tests[i].err_code == err_code, "tr2_sys__Lstat(): test %d err_code expect: %d, got %d\n",
i+1, tests[i].err_code, err_code); i+1, tests[i].err_code, err_code);
} }