Changeset 78667 in vbox for trunk/src/VBox

Timestamp:

May 22, 2019 3:42:14 PM (6 years ago)

Author:

vboxsync

Message:

ValidationKit/SerialTest: Add option to abort the process when the first error is hit so there is a chance to find the problemativ spot in the VM debug logs

File:

• trunk/src/VBox/ValidationKit/utils/serial/SerialTest.cpp (modified) (20 diffs)

trunk/src/VBox/ValidationKit/utils/serial/SerialTest.cpp

@@ -157 +157 @@
     {"--tests",            't', RTGETOPT_REQ_STRING },
     {"--txbytes",          'x', RTGETOPT_REQ_UINT32 },
+    {"--abort-on-error",   'a', RTGETOPT_REQ_NOTHING},
     {"--verbose",          'v', RTGETOPT_REQ_NOTHING},
     {"--help",             'h', RTGETOPT_REQ_NOTHING}
@@ -188 +189 @@
 /** Number of bytes to transmit for read/write tests. */
 static size_t          g_cbTx                 = _1M;
+/** Flag whether to abort the tool when encountering the first error. */
+static bool            g_fAbortOnError        = false;
 /** The config used. */
 static RTSERIALPORTCFG g_SerialPortCfg =
@@ -203 +206 @@
 
 /**
+ * RTTestFailed() wrapper which aborts the program if the option is set.
+ */
+static void serialTestFailed(RTTEST hTest, const char *pszFmt, ...)
+{
+    va_list va;
+    va_start(va, pszFmt);
+    RTTestFailedV(hTest, pszFmt, va);
+    va_end(va);
+    if (g_fAbortOnError)
+        RT_BREAKPOINT();
+}
+
+
+/**
  * Initializes a TX buffer.
  *
@@ -344 +361 @@
             fFailed = true;
             if (g_cVerbosity > 0)
-                RTTestFailed(hTest, "Data corruption/loss detected, expected counter value %u got %u\n",
-                             pSerBuf->iCnt, u32Val);
+                serialTestFailed(hTest, "Data corruption/loss detected, expected counter value %u got %u\n",
+                                 pSerBuf->iCnt, u32Val);
         }
     }
@@ -352 +369 @@
     {
         fFailed = true;
-        RTTestFailed(hTest, "Overtook the send buffer, expected maximum counter value %u got %u\n",
-                     iCntTx, pSerBuf->iCnt);
+        serialTestFailed(hTest, "Overtook the send buffer, expected maximum counter value %u got %u\n",
+                         iCntTx, pSerBuf->iCnt);
     }
 
@@ -372 +389 @@
     return RTRandAdvU32Ex(g_hRand, 0, 1) == 1;
 }
+
 
 /**
@@ -415 +433 @@
             {
                 fFailed = true;
-                RTTestFailed(pSerialTest->hTest, "Data corruption/loss detected\n");
+                serialTestFailed(pSerialTest->hTest, "Data corruption/loss detected\n");
             }
         }
@@ -523 +541 @@
                         if (RT_FAILURE(rc))
                         {
-                            RTTestFailed(g_hTest, "Changing status lines failed with %Rrc on iteration %u (fSet=%#x fClear=%#x)\n",
-                                         rc, i, fStsLinesSet, fStsLinesClear);
+                            serialTestFailed(g_hTest, "Changing status lines failed with %Rrc on iteration %u (fSet=%#x fClear=%#x)\n",
+                                             rc, i, fStsLinesSet, fStsLinesClear);
                             break;
                         }
@@ -535 +553 @@
                             && (rc != VERR_TIMEOUT && !fStsLinesSet && !fStsLinesClear))
                         {
-                            RTTestFailed(g_hTest, "Waiting for status line change failed with %Rrc on iteration %u\n",
-                                         rc, i);
+                            serialTestFailed(g_hTest, "Waiting for status line change failed with %Rrc on iteration %u\n",
+                                             rc, i);
                             break;
                         }
@@ -544 +562 @@
                         if (RT_FAILURE(rc))
                         {
-                            RTTestFailed(g_hTest, "Querying status lines failed with %Rrc on iteration %u\n",
-                                         rc, i);
+                            serialTestFailed(g_hTest, "Querying status lines failed with %Rrc on iteration %u\n",
+                                             rc, i);
                             break;
                         }
@@ -555 +573 @@
                             if (   (fStsLinesQueried & RTSERIALPORT_STS_LINE_DSR)
                                 && !(fStsLinesSet & RTSERIALPORT_CHG_STS_LINES_F_DTR))
-                                RTTestFailed(g_hTest, "DSR line got set when it shouldn't be on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "DSR line got set when it shouldn't be on iteration %u\n", i);
                             else if (   !(fStsLinesQueried & RTSERIALPORT_STS_LINE_DSR)
                                      && !(fStsLinesClear & RTSERIALPORT_CHG_STS_LINES_F_DTR))
-                                RTTestFailed(g_hTest, "DSR line got cleared when it shouldn't be on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "DSR line got cleared when it shouldn't be on iteration %u\n", i);
                         }
                         else if (   (fStsLinesSet & RTSERIALPORT_CHG_STS_LINES_F_DTR)
                                  || (fStsLinesClear & RTSERIALPORT_CHG_STS_LINES_F_DTR))
-                                RTTestFailed(g_hTest, "DSR line didn't change when it should have on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "DSR line didn't change when it should have on iteration %u\n", i);
 
                         if (   (fStsLinesQueried & RTSERIALPORT_STS_LINE_DCD)
@@ -569 +587 @@
                             if (   (fStsLinesQueried & RTSERIALPORT_STS_LINE_DCD)
                                 && !(fStsLinesSet & RTSERIALPORT_CHG_STS_LINES_F_DTR))
-                                RTTestFailed(g_hTest, "DCD line got set when it shouldn't be on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "DCD line got set when it shouldn't be on iteration %u\n", i);
                             else if (   !(fStsLinesQueried & RTSERIALPORT_STS_LINE_DCD)
                                      && !(fStsLinesClear & RTSERIALPORT_CHG_STS_LINES_F_DTR))
-                                RTTestFailed(g_hTest, "DCD line got cleared when it shouldn't be on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "DCD line got cleared when it shouldn't be on iteration %u\n", i);
                         }
                         else if (   (fStsLinesSet & RTSERIALPORT_CHG_STS_LINES_F_DTR)
                                  || (fStsLinesClear & RTSERIALPORT_CHG_STS_LINES_F_DTR))
-                                RTTestFailed(g_hTest, "DCD line didn't change when it should have on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "DCD line didn't change when it should have on iteration %u\n", i);
 
                         if (   (fStsLinesQueried & RTSERIALPORT_STS_LINE_CTS)
@@ -583 +601 @@
                             if (   (fStsLinesQueried & RTSERIALPORT_STS_LINE_CTS)
                                 && !(fStsLinesSet & RTSERIALPORT_CHG_STS_LINES_F_RTS))
-                                RTTestFailed(g_hTest, "CTS line got set when it shouldn't be on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "CTS line got set when it shouldn't be on iteration %u\n", i);
                             else if (   !(fStsLinesQueried & RTSERIALPORT_STS_LINE_CTS)
                                      && !(fStsLinesClear & RTSERIALPORT_CHG_STS_LINES_F_RTS))
-                                RTTestFailed(g_hTest, "CTS line got cleared when it shouldn't be on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "CTS line got cleared when it shouldn't be on iteration %u\n", i);
                         }
                         else if (   (fStsLinesSet & RTSERIALPORT_CHG_STS_LINES_F_RTS)
                                  || (fStsLinesClear & RTSERIALPORT_CHG_STS_LINES_F_RTS))
-                                RTTestFailed(g_hTest, "CTS line didn't change when it should have on iteration %u\n", i);
+                                serialTestFailed(g_hTest, "CTS line didn't change when it should have on iteration %u\n", i);
 
                         if (RTTestErrorCount(g_hTest) > 0)
@@ -601 +619 @@
                 }
                 else
-                    RTTestFailed(g_hTest, "Status lines active which should be clear (%#x, but expected %#x)\n",
-                                 fStsLinesQueriedOld, 0);
+                    serialTestFailed(g_hTest, "Status lines active which should be clear (%#x, but expected %#x)\n",
+                                     fStsLinesQueriedOld, 0);
             }
             else
-                RTTestFailed(g_hTest, "Querying status lines failed with %Rrc\n", rc);
+                serialTestFailed(g_hTest, "Querying status lines failed with %Rrc\n", rc);
         }
         else
-            RTTestFailed(g_hTest, "Clearing status lines failed with %Rrc\n", rc);
+            serialTestFailed(g_hTest, "Clearing status lines failed with %Rrc\n", rc);
     }
     else
@@ -856 +874 @@
                 g_cbTx = ValueUnion.u32;
                 break;
+            case 'a':
+                g_fAbortOnError = true;
+                break;
             default:
                 return RTGetOptPrintError(rc, &ValueUnion);
@@ -909 +930 @@
                 rc = RTSerialPortOpen(&g_hSerialPortSecondary, pszDeviceSecondary, fFlags);
                 if (RT_FAILURE(rc))
-                    RTTestFailed(g_hTest, "Opening secondary device \"%s\" failed with %Rrc\n", pszDevice, rc);
+                    serialTestFailed(g_hTest, "Opening secondary device \"%s\" failed with %Rrc\n", pszDevice, rc);
             }
 
@@ -924 +945 @@
                         rc = RTSerialPortCfgSet(g_hSerialPortSecondary, &g_SerialPortCfg, NULL);
                         if (RT_FAILURE(rc))
-                            RTTestFailed(g_hTest, "Setting configuration of secondary device \"%s\" failed with %Rrc\n", pszDevice, rc);
+                            serialTestFailed(g_hTest, "Setting configuration of secondary device \"%s\" failed with %Rrc\n", pszDevice, rc);
                     }
 
@@ -942 +963 @@
                             if (   RT_FAILURE(rc)
                                 || RTTestErrorCount(g_hTest) > 0)
-                                RTTestFailed(g_hTest, "Running test \"%s\" failed (%Rrc, cErrors=%u)\n",
-                                             pTest->pszId, rc, RTTestErrorCount(g_hTest));
+                                serialTestFailed(g_hTest, "Running test \"%s\" failed (%Rrc, cErrors=%u)\n",
+                                                 pTest->pszId, rc, RTTestErrorCount(g_hTest));
 
                             RTTestSubDone(g_hTest);
@@ -951 +972 @@
                 }
                 else
-                    RTTestFailed(g_hTest, "Setting configuration of device \"%s\" failed with %Rrc\n", pszDevice, rc);
+                    serialTestFailed(g_hTest, "Setting configuration of device \"%s\" failed with %Rrc\n", pszDevice, rc);
 
                 RTSerialPortClose(g_hSerialPort);
@@ -957 +978 @@
         }
         else
-            RTTestFailed(g_hTest, "Opening device \"%s\" failed with %Rrc\n", pszDevice, rc);
+            serialTestFailed(g_hTest, "Opening device \"%s\" failed with %Rrc\n", pszDevice, rc);
     }
     else
-        RTTestFailed(g_hTest, "No device given on command line\n");
+        serialTestFailed(g_hTest, "No device given on command line\n");
 
     RTRandAdvDestroy(g_hRand);