Changeset 92613 in vbox for trunk/src/VBox/HostDrivers/Support/testcase

Timestamp:

Nov 26, 2021 9:53:47 PM (3 years ago)

Author:

vboxsync

Message:

SUP,IPRT,++: Adding SUPSECMAIN_FLAGS_DRIVERLESS_IEM_ALLOWED and SUPR3INIT_F_DRIVERLESS_NEM_FALLBACK to SUPLib and RTR3INIT_FLAGS_TRY_SUPLIB to RTR3Init*, the latter probably reflects the actual state there a lot better. Currently only the TRY_SUPLIB option works, the other two aren't really implemented in SUPLib yet. bugref:10138

Location:

trunk/src/VBox/HostDrivers/Support/testcase

Files:

• SUPLoggerCtl.cpp (modified) (2 diffs)
• tstPage.cpp (modified) (1 diff)
• tstPin.cpp (modified) (1 diff)
• tstSupSem-Zombie.cpp (modified) (1 diff)
• tstSupSem.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp

@@ -59 +59 @@
 int main(int argc, char **argv)
 {
-    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
+    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_TRY_SUPLIB);
 
     /*
@@ -151 +151 @@
 
     /*
-     * Do the requested job.
+     * Make sure the support library is initialized.
      */
-    int rc;
-    switch (enmWhat)
+    int rc = SUPR3Init(NULL /*ppSession*/);
+    if (RT_SUCCESS(rc))
     {
-        case kSupLoggerCtl_Set:
-            rc = SUPR3LoggerSettings(enmWhich, pszFlags, pszGroups, pszDest);
-            break;
-        case kSupLoggerCtl_Create:
-            rc = SUPR3LoggerCreate(enmWhich, pszFlags, pszGroups, pszDest);
-            break;
-        case kSupLoggerCtl_Destroy:
-            rc = SUPR3LoggerDestroy(enmWhich);
-            break;
-        default:
-            rc = VERR_INTERNAL_ERROR;
-            break;
+        /*
+         * Do the requested job.
+         */
+        switch (enmWhat)
+        {
+            case kSupLoggerCtl_Set:
+                rc = SUPR3LoggerSettings(enmWhich, pszFlags, pszGroups, pszDest);
+                break;
+            case kSupLoggerCtl_Create:
+                rc = SUPR3LoggerCreate(enmWhich, pszFlags, pszGroups, pszDest);
+                break;
+            case kSupLoggerCtl_Destroy:
+                rc = SUPR3LoggerDestroy(enmWhich);
+                break;
+            default:
+                rc = VERR_INTERNAL_ERROR;
+                break;
+        }
+        if (RT_SUCCESS(rc))
+            RTPrintf("SUPLoggerCtl: Success\n");
+        else
+            RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: rc=%Rrc\n", rc);
     }
-    if (RT_SUCCESS(rc))
-        RTPrintf("SUPLoggerCtl: Success\n");
     else
-        RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: rc=%Rrc\n", rc);
+        RTStrmPrintf(g_pStdErr, "SUPR3Init: error: rc=%Rrc\n", rc);
 
     return RT_SUCCESS(rc) ? 0 : 1;

trunk/src/VBox/HostDrivers/Support/testcase/tstPage.cpp

@@ -40 +40 @@
     int cErrors = 0;
 
-    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
+    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_TRY_SUPLIB);
     int rc = SUPR3Init(NULL);
     cErrors += rc != 0;

trunk/src/VBox/HostDrivers/Support/testcase/tstPin.cpp

@@ -46 +46 @@
     RTHCPHYS    HCPhys;
 
-    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
+    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_TRY_SUPLIB);
     rc = SUPR3Init(NULL);
     RTPrintf("SUPR3Init -> rc=%d\n", rc);

trunk/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp

@@ -95 +95 @@
      * Init.
      */
-    int rc = RTR3InitExeNoArguments(RTR3INIT_FLAGS_SUPLIB);
+    int rc = RTR3InitExeNoArguments(RTR3INIT_FLAGS_TRY_SUPLIB);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp

@@ -80 +80 @@
      * Init.
      */
-    int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
+    int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_TRY_SUPLIB);
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);