shell32/tests: Use win_skip() instead of skip() and trace().
This commit is contained in:
parent
ce78a66d8e
commit
25d7065885
|
@ -1565,21 +1565,21 @@ static void testSHGetFolderPathAndSubDirA(void)
|
||||||
}
|
}
|
||||||
if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))
|
if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))
|
||||||
{
|
{
|
||||||
skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n");
|
win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(testpath, "%s\\%s", appdata, winetemp);
|
sprintf(testpath, "%s\\%s", appdata, winetemp);
|
||||||
delret = RemoveDirectoryA(testpath);
|
delret = RemoveDirectoryA(testpath);
|
||||||
if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) ) {
|
if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) ) {
|
||||||
skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError());
|
win_skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(testpath, "%s\\%s", appdata, wine);
|
sprintf(testpath, "%s\\%s", appdata, wine);
|
||||||
delret = RemoveDirectoryA(testpath);
|
delret = RemoveDirectoryA(testpath);
|
||||||
if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) && (ERROR_FILE_NOT_FOUND != GetLastError())) {
|
if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) && (ERROR_FILE_NOT_FOUND != GetLastError())) {
|
||||||
skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError());
|
win_skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1695,7 +1695,7 @@ static void test_LocalizedNames(void)
|
||||||
len = lstrlenA(cCurrDirA);
|
len = lstrlenA(cCurrDirA);
|
||||||
|
|
||||||
if (len == 0) {
|
if (len == 0) {
|
||||||
trace("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n");
|
win_skip("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n");
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
if(cCurrDirA[len-1] == '\\')
|
if(cCurrDirA[len-1] == '\\')
|
||||||
|
@ -1944,7 +1944,7 @@ START_TEST(shlfolder)
|
||||||
if(pSHGetFolderPathAndSubDirA)
|
if(pSHGetFolderPathAndSubDirA)
|
||||||
testSHGetFolderPathAndSubDirA();
|
testSHGetFolderPathAndSubDirA();
|
||||||
else
|
else
|
||||||
skip("SHGetFolderPathAndSubDirA not present\n");
|
win_skip("SHGetFolderPathAndSubDirA not present\n");
|
||||||
test_LocalizedNames();
|
test_LocalizedNames();
|
||||||
if(pSHCreateShellItem)
|
if(pSHCreateShellItem)
|
||||||
test_SHCreateShellItem();
|
test_SHCreateShellItem();
|
||||||
|
|
Loading…
Reference in New Issue