system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

shell32/tests: Use win_skip() instead of skip() and trace().

Browse source
This commit is contained in:
Nicolas Le Cam 2009-06-20 12:51:06 +02:00 committed by Alexandre Julliard
parent ce78a66d8e
commit 25d7065885
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/shell32/tests/shlfolder.c
View file

@ -1565,21 +1565,21 @@ static void testSHGetFolderPathAndSubDirA(void)
}
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;
}
sprintf(testpath, "%s\\%s", appdata, winetemp);
delret = RemoveDirectoryA(testpath);
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;
}
sprintf(testpath, "%s\\%s", appdata, wine);
delret = RemoveDirectoryA(testpath);
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;
}
@ -1695,7 +1695,7 @@ static void test_LocalizedNames(void)
len = lstrlenA(cCurrDirA);
if (len == 0) {
trace("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n");
win_skip("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n");
goto cleanup;
}
if(cCurrDirA[len-1] == '\\')
@ -1944,7 +1944,7 @@ START_TEST(shlfolder)
if(pSHGetFolderPathAndSubDirA)
testSHGetFolderPathAndSubDirA();
else
skip("SHGetFolderPathAndSubDirA not present\n");
win_skip("SHGetFolderPathAndSubDirA not present\n");
test_LocalizedNames();
if(pSHCreateShellItem)
test_SHCreateShellItem();