Changeset 72029 in vbox

Timestamp:

Apr 26, 2018 8:32:47 AM (7 years ago)

Author:

vboxsync

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

122325

Message:

ValidationKit/tests/serial: Add verbose flag to avoid flooding the log with error messages by default

Location:

trunk/src/VBox/ValidationKit

Files:

• tests/serial/tdSerial1.py (modified) (6 diffs)
• utils/serial/SerialTest.cpp (modified) (5 diffs)

trunk/src/VBox/ValidationKit/tests/serial/tdSerial1.py

@@ -67 +67 @@
         self.oLoopback        = None;
         self.sLocation        = None;
+        self.fVerboseTest     = False;
 
     #
@@ -79 +80 @@
         reporter.log('  --serial-tests    <t1[:t2[:]]');
         reporter.log('      Default: %s' % (':'.join(self.asSerialTestsDef)));
+        reporter.log('  --verbose-test');
+        reporter.log('      Whether to enable verbose output when running the');
+        reporter.log('      test utility inside the VM');
         return rc;
 
@@ -98 +102 @@
                 if s not in self.asSerialTestsDef:
                     reporter.log('warning: The "--serial-tests" value "%s" is not a valid serial port test.' % (s));
+        elif asArgs[iArg] == '--verbose-test':
+            iArg += 1;
+            self.fVerboseTest = True;
         else:
             return vbox.TestDriver.parseOption(self, asArgs, iArg);
@@ -190 +197 @@
 
         reporter.testStart('Write');
-        tupCmdLine = ('SerialTest', '--tests', 'write', '--txbytes', '1048576', '--device');
+        tupCmdLine = ('SerialTest', '--tests', 'write', '--txbytes', '1048576',);
+        if self.fVerboseTest:
+            tupCmdLine += ('--verbose');
         if oTestVm.isWindows():
-            tupCmdLine += (r'\\.\COM1',);
+            tupCmdLine += ('--device', r'\\.\COM1',);
         elif oTestVm.isLinux():
-            tupCmdLine += (r'/dev/ttyS0',);
+            tupCmdLine += ('--device', r'/dev/ttyS0',);
 
         fRc = self.txsRunTest(oTxsSession, 'SerialTest', 3600 * 1000, \
@@ -218 +227 @@
                 oFile.close();
             except:
+                reporter.logXcpt();
                 reporter.testFailure('Verifying the written data failed');
         reporter.testDone();
@@ -229 +239 @@
 
         reporter.testStart('ReadWrite');
-        tupCmdLine = ('SerialTest', '--tests', 'readwrite', '--txbytes', '1048576', '--device');
+        tupCmdLine = ('SerialTest', '--tests', 'readwrite', '--txbytes', '1048576');
+        if self.fVerboseTest:
+            tupCmdLine += ('--verbose');
         if oTestVm.isWindows():
-            tupCmdLine += (r'\\.\COM1',);
+            tupCmdLine += ('--device', r'\\.\COM1',);
         elif oTestVm.isLinux():
-            tupCmdLine += (r'/dev/ttyS0',);
+            tupCmdLine += ('--device', r'/dev/ttyS0',);
 
         fRc = self.txsRunTest(oTxsSession, 'SerialTest', 600 * 1000, \

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

@@ -157 +157 @@
     {"--tests",            't', RTGETOPT_REQ_STRING },
     {"--txbytes",          'x', RTGETOPT_REQ_UINT32 },
+    {"--verbose",          'v', RTGETOPT_REQ_NOTHING},
     {"--help",             'h', RTGETOPT_REQ_NOTHING}
 };
@@ -173 +174 @@
 };
 
+/** Verbosity value. */
+static unsigned        g_cVerbosity           = 0;
 /** The test handle. */
 static RTTEST          g_hTest                = NIL_RTTEST;
@@ -330 +333 @@
 {
     uint32_t offRx = 0;
+    bool fFailed = false;
 
     while (offRx + sizeof(uint32_t) < pSerBuf->offBuf)
@@ -337 +341 @@
 
         if (RT_UNLIKELY(u32Val != ++pSerBuf->iCnt))
-            RTTestFailed(hTest, "Data corruption/loss detected, expected counter value %u got %u\n",
-                         pSerBuf->iCnt, u32Val);
-    }
+        {
+            fFailed = true;
+            if (g_cVerbosity > 0)
+                RTTestFailed(hTest, "Data corruption/loss detected, expected counter value %u got %u\n",
+                             pSerBuf->iCnt, u32Val);
+        }
+    }
+
+    if (fFailed)
+        RTTestFailed(hTest, "Data corruption/loss detected\n");
 
     if (RT_UNLIKELY(pSerBuf->iCnt > iCntTx))
@@ -757 +768 @@
                 serialTestUsage(g_pStdOut);
                 return RTEXITCODE_SUCCESS;
+            case 'v':
+                g_cVerbosity++;
+                break;
             case 'd':
                 pszDevice = ValueUnion.psz;