localspl/tests: test cleanup
Austin English
austinenglish at gmail.com
Thu Feb 24 20:30:18 CST 2011
Removes win9x hacks, uses win_skip instead of skip, and add missing broken()'s.
Passes wtb:
https://testbot.winehq.org/JobDetails.pl?Key=9480
--
-Austin
-------------- next part --------------
diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c
index 4e913c0..8ecd4db 100644
--- a/dlls/localspl/tests/localmon.c
+++ b/dlls/localspl/tests/localmon.c
@@ -165,7 +165,7 @@ static void find_installed_ports(void)
res = pEnumPorts(NULL, 1, (LPBYTE) pi, needed, &needed, &returned);
if (!res) {
- skip("no ports found\n");
+ win_skip("no ports found\n");
HeapFree(GetProcessHeap(), 0, pi);
return;
}
@@ -235,11 +235,11 @@ static void test_AddPortEx(void)
DWORD res;
if (!pAddPortEx) {
- skip("AddPortEx\n");
+ win_skip("AddPortEx\n");
return;
}
if ((!pDeletePort) && (!hXcv)) {
- skip("No API to delete a Port\n");
+ win_skip("No API to delete a Port\n");
return;
}
@@ -607,14 +607,13 @@ static void test_InitializePrintMonitor(void)
SetLastError(0xdeadbeef);
res = pInitializePrintMonitor(NULL);
- /* The Parameter was unchecked before w2k */
- ok( res || (GetLastError() == ERROR_INVALID_PARAMETER),
+ ok( broken((DWORD)res) /* NT4 */ || (GetLastError() == ERROR_INVALID_PARAMETER),
"returned %p with %u\n (expected '!= NULL' or: NULL with "
"ERROR_INVALID_PARAMETER)\n", res, GetLastError());
SetLastError(0xdeadbeef);
res = pInitializePrintMonitor(emptyW);
- ok( res || (GetLastError() == ERROR_INVALID_PARAMETER),
+ ok( broken((DWORD)res) /* NT4 */ || (GetLastError() == ERROR_INVALID_PARAMETER),
"returned %p with %u\n (expected '!= NULL' or: NULL with "
"ERROR_INVALID_PARAMETER)\n", res, GetLastError());
@@ -665,7 +664,7 @@ static void test_OpenPort(void)
hPort = (HANDLE) 0xdeadbeef;
SetLastError(0xdeadbeef);
res = pOpenPort(nameW, &hPort);
- ok( res || (GetLastError() == ERROR_ACCESS_DENIED),
+ ok( GetLastError() == ERROR_ACCESS_DENIED,
"got %u with %u and %p (expected '!= 0' or '0' with ERROR_ACCESS_DENIED)\n",
res, GetLastError(), hPort);
@@ -673,7 +672,7 @@ static void test_OpenPort(void)
hPort2 = (HANDLE) 0xdeadbeef;
SetLastError(0xdeadbeef);
res2 = pOpenPort(nameW, &hPort2);
- ok( res2 || (GetLastError() == ERROR_ACCESS_DENIED),
+ ok( GetLastError() == ERROR_ACCESS_DENIED,
"got %u with %u and %p (expected '!= 0' or '0' with ERROR_ACCESS_DENIED)\n",
res2, GetLastError(), hPort2);
@@ -829,21 +828,19 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void)
/* Read the original value from the registry */
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsA, 0, KEY_ALL_ACCESS, &hroot);
if (res == ERROR_ACCESS_DENIED) {
- skip("ACCESS_DENIED\n");
+ win_skip("ACCESS_DENIED\n");
return;
}
if (res != ERROR_SUCCESS) {
/* unable to open the registry: skip the test */
- skip("got %d\n", res);
+ win_skip("got %d\n", res);
return;
}
org_value[0] = '\0';
needed = sizeof(org_value)-1 ;
res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) org_value, &needed);
- ok( (res == ERROR_SUCCESS) || (res == ERROR_FILE_NOT_FOUND),
- "returned %u and %u for \"%s\" (expected ERROR_SUCCESS or "
- "ERROR_FILE_NOT_FOUND)\n", res, needed, org_value);
+ ok( res == ERROR_SUCCESS, "returned %u and %u for \"%s\" (expected ERROR_SUCCESS)\n", res, needed, org_value);
RegDeleteValueA(hroot, TransmissionRetryTimeoutA);
@@ -852,7 +849,7 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void)
SetLastError(0xdeadbeef);
res = pXcvDataPort(hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) num_0W, sizeof(num_0W), NULL, 0, &needed);
if (res == ERROR_INVALID_PARAMETER) {
- skip("'ConfigureLPTPortCommandOK' not supported\n");
+ win_skip("'ConfigureLPTPortCommandOK' not supported\n");
return;
}
ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError());
@@ -960,7 +957,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void)
SetLastError(0xdeadbeef);
res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, NULL, 0, &needed);
if (res == ERROR_INVALID_PARAMETER) {
- skip("'GetTransmissionRetryTimeout' not supported\n");
+ win_skip("'GetTransmissionRetryTimeout' not supported\n");
return;
}
len = sizeof(DWORD);
@@ -972,22 +969,20 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void)
/* Read the original value from the registry */
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsA, 0, KEY_ALL_ACCESS, &hroot);
if (res == ERROR_ACCESS_DENIED) {
- skip("ACCESS_DENIED\n");
+ win_skip("ACCESS_DENIED\n");
return;
}
if (res != ERROR_SUCCESS) {
/* unable to open the registry: skip the test */
- skip("got %d\n", res);
+ win_skip("got %d\n", res);
return;
}
org_value[0] = '\0';
needed = sizeof(org_value)-1 ;
res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) org_value, &needed);
- ok( (res == ERROR_SUCCESS) || (res == ERROR_FILE_NOT_FOUND),
- "returned %u and %u for \"%s\" (expected ERROR_SUCCESS or "
- "ERROR_FILE_NOT_FOUND)\n", res, needed, org_value);
+ ok( res == ERROR_SUCCESS, "returned %u and %u for \"%s\" (expected ERROR_SUCCESS)\n", res, needed, org_value);
/* Get default value (documented as 90 in the w2k reskit, but that is wrong) */
RegDeleteValueA(hroot, TransmissionRetryTimeoutA);
@@ -1078,7 +1073,7 @@ static void test_XcvDataPort_MonitorUI(void)
SetLastError(0xdeadbeef);
res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed);
if (res == ERROR_INVALID_PARAMETER) {
- skip("'MonitorUI' nor supported\n");
+ win_skip("'MonitorUI' nor supported\n");
return;
}
ok( (res == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH),
@@ -1086,7 +1081,7 @@ static void test_XcvDataPort_MonitorUI(void)
" and '<= MAX_PATH')\n", res, GetLastError(), needed);
if (needed > MAX_PATH) {
- skip("buffer overflow (%u)\n", needed);
+ win_skip("buffer overflow (%u)\n", needed);
return;
}
len = needed;
@@ -1171,7 +1166,7 @@ static void test_XcvDataPort_PortIsValid(void)
SetLastError(0xdeadbeef);
res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed);
if (res == ERROR_INVALID_PARAMETER) {
- skip("'PostIsValid' not supported\n");
+ win_skip("'PostIsValid' not supported\n");
return;
}
ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError());
@@ -1240,9 +1235,9 @@ static void test_XcvDataPort_PortIsValid(void)
SetLastError(0xdeadbeef);
res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), NULL, 0, &needed);
/* XP(admin): ERROR_INVALID_NAME, XP(user): ERROR_PATH_NOT_FOUND, w2k ERROR_ACCESS_DENIED */
- ok( (res == ERROR_INVALID_NAME) || (res == ERROR_PATH_NOT_FOUND) ||
- (res == ERROR_ACCESS_DENIED), "returned %d with %u and 0x%x "
- "(expected ERROR_INVALID_NAME, ERROR_PATH_NOT_FOUND or ERROR_ACCESS_DENIED)\n",
+ ok( (res == ERROR_INVALID_NAME) || broken(res == ERROR_PATH_NOT_FOUND) ||
+ broken(res == ERROR_ACCESS_DENIED), "returned %d with %u and 0x%x "
+ "(expected ERROR_INVALID_NAME)\n",
res, GetLastError(), needed);
@@ -1360,14 +1355,6 @@ START_TEST(localmon)
DWORD numentries;
DWORD res;
- LoadLibraryA("winspool.drv");
- /* This DLL does not exist on Win9x */
- hdll = LoadLibraryA("localspl.dll");
- if (!hdll) {
- skip("localspl.dll cannot be loaded, most likely running on Win9x\n");
- return;
- }
-
tempdirW[0] = '\0';
tempfileW[0] = '\0';
res = GetTempPathW(MAX_PATH, tempdirW);
@@ -1439,7 +1426,7 @@ START_TEST(localmon)
test_OpenPort();
if ( !hXcv ) {
- skip("Xcv not supported\n");
+ win_skip("Xcv not supported\n");
}
else
{
More information about the wine-patches
mailing list