Nicolas Le Cam : kernel32/tests: Skip GetVolumeInformation test on current directory when running on a root directory .
Alexandre Julliard
julliard at winehq.org
Mon Aug 3 11:15:22 CDT 2009
Module: wine
Branch: master
Commit: 5e58b29cfec3a9a34ecdae90defc088953edad26
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e58b29cfec3a9a34ecdae90defc088953edad26
Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date: Mon Jul 13 20:13:54 2009 +0200
kernel32/tests: Skip GetVolumeInformation test on current directory when running on a root directory.
---
dlls/kernel32/tests/volume.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
index 09aa4b3..f569247 100644
--- a/dlls/kernel32/tests/volume.c
+++ b/dlls/kernel32/tests/volume.c
@@ -322,16 +322,21 @@ static void test_GetVolumeInformationA(void)
ret = pGetVolumeNameForVolumeMountPointA(Root_Dir1, volume, MAX_PATH);
ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n");
- /* **** now start the tests **** */
- /* check for error on no trailing \ */
- ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL,
- NULL, NULL, fs_name_buf, fs_name_len);
- ok(!ret && GetLastError() == ERROR_INVALID_NAME,
- "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError());
-
result = GetCurrentDirectory(MAX_PATH, currentdir);
ok(result, "GetCurrentDirectory: error %d\n", GetLastError());
+ /* **** now start the tests **** */
+ /* check for error on no trailing \ */
+ if (result > 3)
+ {
+ ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL,
+ NULL, NULL, fs_name_buf, fs_name_len);
+ ok(!ret && GetLastError() == ERROR_INVALID_NAME,
+ "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError());
+ }
+ else
+ skip("Running on a root directory\n");
+
/* check for error on no trailing \ when current dir is root dir */
ret = SetCurrentDirectory(Root_Dir1);
ok(ret, "SetCurrentDirectory: error %d\n", GetLastError());
More information about the wine-cvs
mailing list