Changeset 61306 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 30, 2016 4:11:26 PM (9 years ago)

Author:

vboxsync

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

107598

Message:

show march in testbox hover on the results page too. (untested)

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/testbox.py (modified) (2 diffs)
• webui/wuireport.py (modified) (1 diff)
• webui/wuitestresult.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

@@ -367 +367 @@
         return None;
 
+    def getPrettyCpuVersion(self):
+        """ Pretty formatting of the family/model/stepping with microarch optimizations. """
+        if self.lCpuRevision is None or self.sCpuVendor is None:
+            return u'<none>';
+        sMarch = self.queryCpuMicroarch();
+        if sMarch is not None:
+            return '%s m%02x s%02x' % (sMarch, self.getCpuModel(), self.getCpuStepping());
+        return 'fam%02x m%02x s%02x' % (self.getCpuFamily(), self.getCpuModel(), self.getCpuStepping());
+
     def getArchBitString(self):
         """ Returns 32-bit, 64-bit, <none>, or sCpuArch. """
@@ -378 +387 @@
 
     def getPrettyCpuVendor(self):
-        """ Returns the CPU model for a x86 or amd64 testboxes."""
+        """ Pretty vendor name."""
         if self.sCpuVendor is None:
             return '<none>';

trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py

@@ -593 +593 @@
         sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getArchBitString()),);
         sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getPrettyCpuVendor()),);
-        sMarch = oTestBox.queryCpuMicroarch();
-        if sMarch is not None:
-            sHtml += u'<td>%s (%#x/%#x)' % (sMarch, oTestBox.getCpuModel(), oTestBox.getCpuStepping(),)
-        else:
-            sHtml += u'<td>fam%x %#x/%#x' % (oTestBox.getCpuFamily(), oTestBox.getCpuModel(), oTestBox.getCpuStepping(),)
+        sHtml += u'<td>%s'         % (oTestBox.getPrettyCpuVersion(),);
         if oTestBox.fCpuNestedPaging:   sHtml += u', np';
         elif oTestBox.fCpuHwVirt:       sHtml += u', hw';

trunk/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py

@@ -608 +608 @@
             aoTestBoxRows.append(['CPU Name', oTestBox.sCpuName.replace('  ', ' ')]);
         if oTestBox.lCpuRevision is not None:
-            # ASSUMING x86+AMD64 versioning scheme here.
-            uFamily   = (oTestBox.lCpuRevision >> 24) & 0xff;
-            uModel    = (oTestBox.lCpuRevision >>  8) & 0xffff;
-            uStepping = oTestBox.lCpuRevision         & 0xff;
+            sMarch = oTestBox.queryCpuMicroarch();
+            if sMarch is not None:
+                aoTestBoxRows.append( ('CPU Microarch', sMarch) );
+            uFamily   = oTestBox.getCpuFamily();
+            uModel    = oTestBox.getCpuModel();
+            uStepping = oTestBox.getCpuStepping();
             aoTestBoxRows += [
                 ( 'CPU Family',   '%u (%#x)' % ( uFamily,   uFamily, ) ),