From ea41e863ad0a943af15dc8a0ea86f728c8155e6b Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Mon, 4 Feb 2008 11:18:52 -0600 Subject: [PATCH] kernel32: Factor out the VerifyVersionInfo tests into their own function. --- dlls/kernel32/tests/version.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index ac4d8142ed0..8aec42a1a07 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -89,18 +89,13 @@ static void test_GetVersionEx(void) ok(ret, "Expected GetVersionExA to succeed\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - } -START_TEST(version) +static void test_VerifyVersionInfo(void) { OSVERSIONINFOEX info = { sizeof(info) }; BOOL ret; - init_function_pointers(); - - test_GetVersionEx(); - if(!pVerifyVersionInfoA || !pVerSetConditionMask) { skip("Needed functions not available\n"); @@ -237,3 +232,11 @@ START_TEST(version) pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); } + +START_TEST(version) +{ + init_function_pointers(); + + test_GetVersionEx(); + test_VerifyVersionInfo(); +}