Changeset 26784 in vbox for trunk/src/VBox/Runtime/testcase/tstRTPipe.cpp

Timestamp:

Feb 25, 2010 11:56:52 AM (15 years ago)

Author:

vboxsync

Message:

iprt/pipe.h++: Adjusted RTPipeWrite[Blocking] behavior wrt to zero byte writes and broken pipes. (darwin will return EPIPE, linux does not.)

File:

• trunk/src/VBox/Runtime/testcase/tstRTPipe.cpp (modified) (4 diffs)

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

@@ -140 +140 @@
     RTTESTI_CHECK_RC_RETV(RTPipeCreate(&hPipeR, &hPipeW, RTPIPE_C_INHERIT_READ | RTPIPE_C_INHERIT_WRITE), VINF_SUCCESS);
     int rc = RTPipeFlush(hPipeW);
-    RTTESTI_CHECK(rc == VERR_NOT_SUPPORTED || rc == VINF_SUCCESS);
+    RTTESTI_CHECK_MSG(rc == VERR_NOT_SUPPORTED || rc == VINF_SUCCESS, ("%Rrc\n", rc));
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeR), VINF_SUCCESS);
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeW), VINF_SUCCESS);
@@ -223 +223 @@
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeR), VINF_SUCCESS);
     cbWritten = ~(size_t)2;
-    RTTESTI_CHECK_RC(RTPipeWrite(hPipeW, "", 0, &cbWritten), VERR_BROKEN_PIPE);
-    RTTESTI_CHECK(cbWritten == ~(size_t)2);
+    RTTESTI_CHECK_RC(RTPipeWrite(hPipeW, "", 0, &cbWritten), VINF_SUCCESS);
+    RTTESTI_CHECK(cbWritten == 0);
     cbWritten = ~(size_t)2;
     RTTESTI_CHECK_RC(RTPipeWrite(hPipeW, "4", 1, &cbWritten), VERR_BROKEN_PIPE);
@@ -233 +233 @@
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeW), VINF_SUCCESS);
     cbRead = ~(size_t)0;
-    RTTESTI_CHECK_RC(RTPipeRead(hPipeR, abBuf, 0, &cbRead), VINF_SUCCESS);         // !?
+    RTTESTI_CHECK_RC(RTPipeRead(hPipeR, abBuf, 0, &cbRead), VINF_SUCCESS);
     RTTESTI_CHECK(cbRead == 0);
     cbRead = ~(size_t)3;
@@ -284 +284 @@
     RTTESTI_CHECK(!memcmp(abBuf, "42!", 3));
     RTTESTI_CHECK_RC(RTPipeClose(hPipeR), VINF_SUCCESS);
-    RTTESTI_CHECK_RC_RETV(RTPipeWriteBlocking(hPipeW, "", 0), VERR_BROKEN_PIPE);
+    RTTESTI_CHECK_RC_RETV(RTPipeWriteBlocking(hPipeW, "", 0), VINF_SUCCESS);
     RTTESTI_CHECK_RC_RETV(RTPipeWriteBlocking(hPipeW, "42", 2), VERR_BROKEN_PIPE);
     RTTESTI_CHECK_RC(RTPipeClose(hPipeW), VINF_SUCCESS);