=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: setupapi/tests: Use todo_wine_if() in tests.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 22 08:57:38 CST 2016
Module: wine
Branch: master
Commit: 5c2cff30aa1bb448f8bdd77ff3b2795be386fac1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2cff30aa1bb448f8bdd77ff3b2795be386fac1
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Sat Feb 20 10:40:45 2016 +0100
setupapi/tests: Use todo_wine_if() in tests.
Signed-off-by: Frédéric Delanoy <frederic.delanoy at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/setupapi/tests/parser.c | 9 +--------
dlls/setupapi/tests/setupcab.c | 22 ++--------------------
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index c2d554a..f929f01 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -152,14 +152,7 @@ static void test_invalid_files(void)
if (invalid_files[i].error) /* should fail */
{
ok( hinf == INVALID_HANDLE_VALUE, "file %u: Open succeeded\n", i );
- if (invalid_files[i].todo) todo_wine
- {
- ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n",
- i, err, invalid_files[i].error );
- ok( err_line == invalid_files[i].err_line, "file %u: Bad error line %d/%d\n",
- i, err_line, invalid_files[i].err_line );
- }
- else
+ todo_wine_if (invalid_files[i].todo)
{
ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n",
i, err, invalid_files[i].error );
diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index 6c76321..33daae9 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -115,19 +115,10 @@ static void test_invalid_parametersA(void)
ret = SetupIterateCabinetA(invalid_parameters[i].CabinetFile, 0,
invalid_parameters[i].MsgHandler, NULL);
ok(!ret, "[%d] Expected SetupIterateCabinetA to return 0, got %d\n", i, ret);
- if (invalid_parameters[i].todo_lasterror)
- {
- todo_wine
- ok(GetLastError() == invalid_parameters[i].expected_lasterror,
- "[%d] Expected GetLastError() to return %u, got %u\n",
- i, invalid_parameters[i].expected_lasterror, GetLastError());
- }
- else
- {
+ todo_wine_if (invalid_parameters[i].todo_lasterror)
ok(GetLastError() == invalid_parameters[i].expected_lasterror,
"[%d] Expected GetLastError() to return %u, got %u\n",
i, invalid_parameters[i].expected_lasterror, GetLastError());
- }
}
SetLastError(0xdeadbeef);
@@ -190,19 +181,10 @@ static void test_invalid_parametersW(void)
ret = SetupIterateCabinetW(invalid_parameters[i].CabinetFile, 0,
invalid_parameters[i].MsgHandler, NULL);
ok(!ret, "[%d] Expected SetupIterateCabinetW to return 0, got %d\n", i, ret);
- if (invalid_parameters[i].todo_lasterror)
- {
- todo_wine
- ok(GetLastError() == invalid_parameters[i].expected_lasterror,
- "[%d] Expected GetLastError() to return %u, got %u\n",
- i, invalid_parameters[i].expected_lasterror, GetLastError());
- }
- else
- {
+ todo_wine_if (invalid_parameters[i].todo_lasterror)
ok(GetLastError() == invalid_parameters[i].expected_lasterror,
"[%d] Expected GetLastError() to return %u, got %u\n",
i, invalid_parameters[i].expected_lasterror, GetLastError());
- }
}
SetLastError(0xdeadbeef);
More information about the wine-cvs
mailing list