vbox的更動 98619 路徑 trunk/src/VBox/Runtime/testcase/tstRTPipe.cpp

時間撮記:

2023-2-17 下午12:40:38 (2 年 以前)

作者:

vboxsync

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

155912

訊息:

IPRT/tstRTPipe: Tweaked the test to no fail on some old windows behaviour that we're not able to work around.

檔案:

• trunk/src/VBox/Runtime/testcase/tstRTPipe.cpp (修改) (7 筆差異)

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

@@ -49 +49 @@
 #include <iprt/process.h>
 #include <iprt/string.h>
+#ifdef RT_OS_WINDOWS
+# include <iprt/system.h>
+#endif
 #include <iprt/test.h>
 
@@ -55 +58 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+static RTTEST     g_hTest            = NIL_RTTEST;
 static const char g_szTest4Message[] = "This is test #4, everything is working fine.\n\r";
 static const char g_szTest5Message[] = "This is test #5, everything is working fine.\n\r";
@@ -214 +218 @@
 {
     RTTestISub("Full write buffer");
-
 #ifdef RT_OS_WINDOWS
     /* Kludge! The RTPipeWrite+RTPipeWriteBlocking code is able to write twice the size
@@ -255 +258 @@
             size_t cbRead;
             RTTESTI_CHECK_RC(RTPipeReadBlocking(hPipeR, s_abBuf, cbToRead, &cbRead), VINF_SUCCESS);
-            RTTESTI_CHECK_RC(RTPipeSelectOne(hPipeW, 0), VINF_SUCCESS);
-            RTTESTI_CHECK_RC(RTPipeSelectOne(hPipeW, 1), VINF_SUCCESS);
-
-            size_t cbWritten = _1G;
-            rc = RTPipeWrite(hPipeW, s_abBuf, sizeof(s_abBuf), &cbWritten);
-            RTTESTI_CHECK(rc == VINF_SUCCESS);
+
+#ifdef RT_OS_WINDOWS
+            /* Kludge! Older Windows NT versions does not complete a pending write till
+                       all the pending data has been read and the pipe buffer is
+                       completely empty. Applies to NT4, W2K, and XP. Though on XP the
+                       test works at 50% for some reason and we can write double the
+                       amount, so possibly a different issue there, so we'l
+
+                       This does not seem to be a bug in pipe-win.cpp. */
+            if (RTSystemGetNtVersion() < (uPct == 50 ? RTSYSTEM_MAKE_NT_VERSION(5,2,0) : RTSYSTEM_MAKE_NT_VERSION(6,0,0)))
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "old buggy windows - skipping 2nd part (0: %Rrc, 1: %Rrc)\n",
+                              RTPipeSelectOne(hPipeW, 0), RTPipeSelectOne(hPipeW, 1));
+            else
+#endif
+            {
+                RTTESTI_CHECK_RC(RTPipeSelectOne(hPipeW, 0), VINF_SUCCESS);
+                RTTESTI_CHECK_RC(RTPipeSelectOne(hPipeW, 1), VINF_SUCCESS);
+
+                size_t cbWritten = _1G;
+                rc = RTPipeWrite(hPipeW, s_abBuf, sizeof(s_abBuf), &cbWritten);
+                RTTESTI_CHECK(rc == VINF_SUCCESS);
+            }
         }
 
@@ -508 +527 @@
         return tstRTPipe5Child(argv[2]);
 
-    RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstRTPipe", &hTest);
+    int rc = RTTestInitAndCreate("tstRTPipe", &g_hTest);
     if (rc)
         return rc;
-    RTTestBanner(hTest);
+    RTTestBanner(g_hTest);
 
     /*
@@ -518 +536 @@
      */
     tstRTPipe1();
-    if (RTTestErrorCount(hTest) == 0)
+    if (RTTestErrorCount(g_hTest) == 0)
     {
         bool fMayPanic = RTAssertMayPanic();
@@ -536 +554 @@
      * Summary.
      */
-    return RTTestSummaryAndDestroy(hTest);
-}
-
+    return RTTestSummaryAndDestroy(g_hTest);
+}
+