Changeset 85382 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Jul 18, 2020 11:33:58 AM (5 years ago)

Author:

vboxsync

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

139396

Message:

iprt/path.h: Adjustments and a bunch of todos for RTPathFindCommon[Ex].

File:

• trunk/src/VBox/Runtime/testcase/tstRTPathFindCommon.cpp (modified) (1 diff)

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

@@ -46 +46 @@
     struct
     {
-        char const *papszPath1;
-        char const *papszPath2;
-        char const *papszPath3;
-        char const *papszPatCommon;
+        char const *apszPaths[3];
+        char const *pszCommon;
+        uint32_t    fFlags;
     } aTests[] =
     {
         /* Simple stuff first. */
-        { "", "", "", "" },
-        { "none", "none", "", "" },
+        { { "",                     "",                 "" },                       "",          RTPATH_STR_F_STYLE_UNIX },
+        { { "none",                 "none",             "" },                       "",          RTPATH_STR_F_STYLE_UNIX },
         /* Missing start slash. */
-        { "/path/to/stuff1", "path/to/stuff2", "", "" },
+        { { "/path/to/stuff1",      "path/to/stuff2",   "" },                       "",          RTPATH_STR_F_STYLE_UNIX },
         /* Working stuff. */
-        { "/path/to/stuff1", "/path/to/stuff2", "/path/to/stuff3", "/path/to/" },
-        { "/path/to/stuff1", "/path/to/", "/path/", "/path/" },
-        { "/path/to/stuff1", "/", "/path/", "" },
-        { "/path/to/../stuff1", "./../", "/path/to/stuff2/..", "" }
+        { { "/path/to/stuff1",      "/path/to/stuff2",  "/path/to/stuff3" },        "/path/to/", RTPATH_STR_F_STYLE_UNIX },
+        { { "/path/to/stuff1",      "/path/to/",        "/path/" },                 "/path/",    RTPATH_STR_F_STYLE_UNIX },
+        { { "/path/to/stuff1",      "/",                "/path/" },                 "",          RTPATH_STR_F_STYLE_UNIX },
+        { { "/path/to/../stuff1",   "./../",            "/path/to/stuff2/.." },     "",          RTPATH_STR_F_STYLE_UNIX },
     };
 
-    const size_t cNumPaths = 3; /* Number of paths to compare. */
+    for (size_t i = 0; i < RT_ELEMENTS(aTests); i++)
+    {
+        size_t cPaths = RT_ELEMENTS(aTests[i].apszPaths);
+        while (cPaths > 0 && aTests[i].apszPaths[cPaths - 1] == NULL)
+            cPaths--;
 
-    size_t cchRes;
-    for (size_t i = 0; i < RT_ELEMENTS(aTests); i++)
-        RTTEST_CHECK_MSG(hTest, (cchRes = RTPathFindCommonEx((const char * const *)&aTests[i], cNumPaths, '/')) == strlen(aTests[i].papszPatCommon),
-                         (hTest, "Test %zu failed: Got %zu, expected %zu\n", i, cchRes, strlen(aTests[i].papszPatCommon)));
+        size_t const cchCommon = RTPathFindCommonEx(cPaths, aTests[i].apszPaths, aTests[i].fFlags);
+        size_t const cchExpect = strlen(aTests[i].pszCommon);
+        if (cchCommon != cchExpect)
+            RTTestFailed(hTest,
+                         "Test %zu failed: got %zu, expected %zu (cPaths=%zu: %s %s %s)", i, cchCommon, cchExpect, cPaths,
+                         aTests[i].apszPaths[0], aTests[i].apszPaths[1], aTests[i].apszPaths[2]);
+    }
 
     /*