Commit 732a0795 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

shell32/tests: Skip some tests if functions are not available.

parent bb4e7832
...@@ -478,11 +478,14 @@ static void testShellValues(const struct shellExpectedValues testEntries[], ...@@ -478,11 +478,14 @@ static void testShellValues(const struct shellExpectedValues testEntries[],
{ {
BYTE type; BYTE type;
type = testSHGetFolderLocation(optional, testEntries[i].folder); if (pSHGetFolderLocation)
ok(type == testEntries[i].pidlType || optional, {
"%s has type %d (0x%02x), expected %d (0x%02x)\n", type = testSHGetFolderLocation(optional, testEntries[i].folder);
getFolderName(testEntries[i].folder), type, type, ok(type == testEntries[i].pidlType || optional,
testEntries[i].pidlType, testEntries[i].pidlType); "%s has type %d (0x%02x), expected %d (0x%02x)\n",
getFolderName(testEntries[i].folder), type, type,
testEntries[i].pidlType, testEntries[i].pidlType);
}
type = testSHGetSpecialFolderLocation(optional, testEntries[i].folder); type = testSHGetSpecialFolderLocation(optional, testEntries[i].folder);
ok(type == testEntries[i].pidlType || optional, ok(type == testEntries[i].pidlType || optional,
"%s has type %d (0x%02x), expected %d (0x%02x)\n", "%s has type %d (0x%02x), expected %d (0x%02x)\n",
...@@ -576,12 +579,15 @@ static void testPersonal(void) ...@@ -576,12 +579,15 @@ static void testPersonal(void)
/* The pidl may be a real folder, or a virtual directory, or a drive if the /* The pidl may be a real folder, or a virtual directory, or a drive if the
* home directory is set to the root directory of a drive. * home directory is set to the root directory of a drive.
*/ */
type = testSHGetFolderLocation(FALSE, CSIDL_PERSONAL); if (pSHGetFolderLocation)
ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE, {
"CSIDL_PERSONAL returned invalid type 0x%02x, " type = testSHGetFolderLocation(FALSE, CSIDL_PERSONAL);
"expected PT_FOLDER or PT_GUID\n", type); ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE,
if (type == PT_FOLDER) "CSIDL_PERSONAL returned invalid type 0x%02x, "
testSHGetFolderPath(FALSE, CSIDL_PERSONAL); "expected PT_FOLDER or PT_GUID\n", type);
if (type == PT_FOLDER)
testSHGetFolderPath(FALSE, CSIDL_PERSONAL);
}
type = testSHGetSpecialFolderLocation(FALSE, CSIDL_PERSONAL); type = testSHGetSpecialFolderLocation(FALSE, CSIDL_PERSONAL);
ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE, ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE,
"CSIDL_PERSONAL returned invalid type 0x%02x, " "CSIDL_PERSONAL returned invalid type 0x%02x, "
...@@ -898,6 +904,10 @@ START_TEST(shellpath) ...@@ -898,6 +904,10 @@ START_TEST(shellpath)
doChild(myARGV[2]); doChild(myARGV[2]);
else else
{ {
/* Report missing functions once */
if (!pSHGetFolderLocation)
skip("SHGetFolderLocation is not available\n");
/* first test various combinations of parameters: */ /* first test various combinations of parameters: */
testApiParameters(); testApiParameters();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment