Changeset 62159 in vbox for trunk

Timestamp:

Jul 11, 2016 12:35:00 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/TestExecService: Add STDINEOS opcode to mark the end of the stdin stream properly

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/txsclient.py (modified) (1 diff)
• utils/TestExecServ/TestExecService.cpp (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/txsclient.py

@@ -764 +764 @@
                         msPendingInputReply = base.timestampMilli();
                         continue;
+
+                    rc = self.sendMsg('STDINEOS');
+                    oStdIn = None;
+                    if rc is not True:
+                        sFailure = 'sendMsg failure';
+                        break;
+                    msPendingInputReply = base.timestampMilli();
 
                 # Wait for input (500 ms timeout).

trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp

@@ -1863 +1863 @@
         else
             rc = txsReplySimple(pPktHdr, "STDINIGN");
+    }
+    /*
+     * Marks the end of the stream for stdin.
+     */
+    else if (txsIsSameOpcode(pPktHdr, "STDINEOS"))
+    {
+        if (RT_LIKELY(pPktHdr->cb == sizeof(TXSPKTHDR)))
+        {
+            /* Close the pipe. */
+            txsDoExecHlpHandleStdInErrorEvent(hPollSet, fPollEvt, phStdInW, pStdInBuf);
+            rc = txsReplyAck(pPktHdr);
+        }
+        else
+            rc = txsReplySimple(pPktHdr, "STDINBAD");
     }
     /*