Changeset 102647 in vbox for trunk/src

Timestamp:

Dec 20, 2023 12:01:26 PM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160809

Message:

IPRT: Implemented RTFsMountpointsEnum(). Extended tstRTFsQueries testcase. bugref:10415

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (3 diffs)
• r3/posix/RTFsMountpointsEnum-posix.cpp (added)
• r3/win/RTFsMountpointsEnum-win.cpp (added)
• testcase/tstRTFsQueries.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1063 +1063 @@
         r3/win/RTCrStoreCreateSnapshotById-win.cpp \
         r3/win/RTFileQuerySectorSize-win.cpp \
+        r3/win/RTFsMountpointsEnum-win.cpp \
         r3/win/RTHandleGetStandard-win.cpp \
         r3/win/RTLocaleQueryNormalizedBaseLocaleName-win.cpp \
@@ -1162 +1163 @@
         r3/linux/RTSystemShutdown-linux.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
+        r3/posix/RTFsMountpointsEnum-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
         r3/posix/RTMemProtect-posix.cpp \
@@ -2984 +2986 @@
 VBoxRT_LIBS.win               += \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/wbemuuid.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/mpr.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
 VBoxRT_LDFLAGS.darwin          = \

trunk/src/VBox/Runtime/testcase/tstRTFsQueries.cpp

@@ -42 +42 @@
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
+#include <iprt/test.h>
 #include <iprt/errcore.h>
 
 
+struct TSTCTX
+{
+    int var;
+    int rc;
+} TestCtx = { 42, VINF_SUCCESS };
+
+DECLCALLBACK(int) mountpointsEnumCallback(const char *pszMountpoint, void *pvUser)
+{
+    TSTCTX *pCtx = (TSTCTX *)pvUser;
+    RTTESTI_CHECK(pCtx->var == 42);
+
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "Mountpoint: %s\n", pszMountpoint);
+
+    return pCtx->rc;
+}
+
+static void tstMountpointsEnum(RTTEST hTest)
+{
+    RTTEST_CHECK_RC_OK(hTest, RTFsMountpointsEnum(mountpointsEnumCallback, &TestCtx));
+}
+
+/** @todo r=andy Overhaul this code to make use of the RTTEST APIs. */
 int main(int argc, char **argv)
 {
-    RTR3InitExe(argc, &argv, 0);
+    RTTEST hTest;
+    RTEXITCODE rcExit = RTTestInitExAndCreate(argc, &argv, 0 /* fFlags */, "tstRTFsQueries", &hTest);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
+    RTTestBanner(hTest);
 
     /*
@@ -116 +143 @@
     }
 
-    if (!cErrors)
-        RTPrintf("tstRTFsQueries: SUCCESS\n");
-    else
-        RTPrintf("tstRTFsQueries: FAIlURE - %u errors\n", cErrors);
-    return !!cErrors;
+    tstMountpointsEnum(hTest);
+
+    if (cErrors)
+        RTTestFailed(hTest, "tstRTFsQueries: FAIlURE - %u errors\n", cErrors);
+
+    /*
+     * Done.
+     */
+    return RTTestSummaryAndDestroy(hTest);
 }