Changeset 99483 in vbox for trunk/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp

Timestamp:

Apr 20, 2023 10:16:10 AM (20 months ago)

Author:

vboxsync

Message:

IPRT/RTProcCreateEx: More fixes for the initial patch supplied; also tweaked the testcases a little. bugref:8053

File:

• trunk/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp (modified) (5 diffs)

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

@@ -107 +107 @@
     const char *pszCWD = argv[2];
 
+    RTStrmPrintf(g_pStdOut, "childcwd: Called with CWD '%s'\n", pszCWD);
+
+    if (!RTStrICmp(pszCWD, "<cwd-not-specified>")) /* Bail out early if no CWD has been explicitly specified. */
+        return RTEXITCODE_SUCCESS;
+
     /* Validate if we really are in the CWD the parent told us. */
     char szCWD[RTPATH_MAX];
@@ -155 +160 @@
         g_szExecName,
         "--testcase-child-cwd",
-        "<invalid-cwd>",
+        "<cwd-not-specified>",
         pszAsUser,
         NULL
@@ -171 +176 @@
                           VERR_INVALID_PARAMETER);
 
+    /* Invalid flag combinations. Windows flags ignored elsewhere. */
+#ifdef RT_OS_WINDOWS
+    int rc = VERR_INVALID_PARAMETER;
+#else
+    int rc = VERR_INVALID_POINTER; /* Due to missing pvExtraData. */
+#endif
+    fFlags = RTPROC_FLAGS_CWD | RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_SERVICE;
+    RTTESTI_CHECK_RC_RETV(RTProcCreateEx(g_szExecName, apszArgs, RTENV_DEFAULT, fFlags,
+                                         NULL, NULL, NULL, pszAsUser, pszPassword,
+                                         NULL, &hProc), rc);
+
+    /* Windows-only flags. Ignored elsewhere. */
+#ifdef RT_OS_WINDOWS
+    rc = VERR_INVALID_POINTER;
+#else
+    rc = VINF_SUCCESS;
+#endif
+    fFlags = RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_SERVICE;
+    RTTESTI_CHECK_RC_RETV(RTProcCreateEx(g_szExecName, apszArgs, RTENV_DEFAULT, fFlags,
+                                         NULL, NULL, NULL, pszAsUser, pszPassword,
+                                         NULL, &hProc), rc);
+
     /* RTPROC_FLAGS_CWD set, but CWD missing as pvExtradata. */
     fFlags = RTPROC_FLAGS_CWD;
@@ -176 +203 @@
                                          NULL, NULL, NULL, pszAsUser, pszPassword,
                                          NULL, &hProc),
-                          VINF_SUCCESS);
-
-    /* CWD is "<invalid-cwd>" from above, should fail. */
-    RTPROCSTATUS ProcStatus = { -1, RTPROCEXITREASON_ABEND };
-    RTTESTI_CHECK_RC(RTProcWait(hProc, RTPROCWAIT_FLAGS_BLOCK, &ProcStatus), VINF_SUCCESS);
+                          VERR_INVALID_POINTER);
 
     char szCWD[RTPATH_MAX];
@@ -193 +216 @@
                                          (void *)szCWD /* pvExtraData (CWD) */, &hProc),
                           VINF_SUCCESS);
+    RTPROCSTATUS ProcStatus = { -1, RTPROCEXITREASON_ABEND };
     RTTESTI_CHECK_RC(RTProcWait(hProc, RTPROCWAIT_FLAGS_BLOCK, &ProcStatus), VINF_SUCCESS);
     if (ProcStatus.enmReason != RTPROCEXITREASON_NORMAL || ProcStatus.iStatus != 0)