Changeset 77566 in vbox for trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

Timestamp:

Mar 5, 2019 12:53:05 PM (6 years ago)

Author:

vboxsync

Message:

FsPerf: Fix mmap coherency test, adjust rmdir(..). bugref:9172

File:

• trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp (modified) (2 diffs)

trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

@@ -1214 +1214 @@
 #endif
 #if defined(RT_OS_WINDOWS)
-    RTTESTI_CHECK_RC(RTDirRemove(InDir(RT_STR_TUPLE(".."))), VERR_SHARING_VIOLATION); /* weird */
+    int rc = RTDirRemove(InDir(RT_STR_TUPLE("..")));
+    if (rc != VERR_DIR_NOT_EMPTY /*ntfs root*/ && rc != VERR_SHARING_VIOLATION /*ntfs weird*/)
+        RTTestIFailed("RTDirRemove(%s) -> %Rrc, expected VERR_DIR_NOT_EMPTY or VERR_SHARING_VIOLATION",  g_szDir, rc);
 #else
     RTTESTI_CHECK_RC(RTDirRemove(InDir(RT_STR_TUPLE(".."))), VERR_DIR_NOT_EMPTY);
@@ -2571 +2573 @@
 
             /* Now dirty everything by inverting everything. */
-            size_t *puCur  = (size_t *)pbMapping;
-            size_t  cbLeft = sizeof(s_abContent);
-            while (cbLeft-- > 0)
+            size_t *puCur = (size_t *)pbMapping;
+            size_t  cLeft = sizeof(s_abContent) / sizeof(*puCur);
+            while (cLeft-- > 0)
             {
                 *puCur = ~*puCur;