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

Timestamp:

Jun 11, 2015 6:48:31 PM (10 years ago)

Author:

vboxsync

Message:

ValidationKit: Added option for skipping raw-mode tests based on testbox config or VirtualBox build. (untested)

Location:

trunk/src/VBox/ValidationKit

Files:

• common/constants/tbreq.py (modified) (1 diff)
• testboxscript/testboxscript_real.py (modified) (4 diffs)
• testdriver/vbox.py (modified) (1 diff)
• testdriver/vboxtestvms.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/common/constants/tbreq.py

@@ -75 +75 @@
 SIGNON_PARAM_HAS_64_BIT_GUEST   = 'HAS_64_BIT_GUST';
 SIGNON_PARAM_HAS_IOMMU          = 'HAS_IOMMU';
+## TODO: SIGNON_PARAM_WITH_RAW_MODE
 SIGNON_PARAM_MEM_SIZE           = 'MEM_SIZE';
 SIGNON_PARAM_SCRATCH_SIZE       = 'SCRATCH_SIZE';

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -171 +171 @@
             constants.tbreq.SIGNON_PARAM_HAS_64_BIT_GUEST: { self.VALUE: self._can64BitGuest(),        self.FN: None },
             constants.tbreq.SIGNON_PARAM_HAS_IOMMU:        { self.VALUE: self._hasHostIoMmu(),         self.FN: None },
+            #constants.tbreq.SIGNON_PARAM_WITH_RAW_MODE:    { self.VALUE: self._withRawModeSupport(),   self.FN: None },
             constants.tbreq.SIGNON_PARAM_SCRIPT_REV:       { self.VALUE: self._getScriptRev(),         self.FN: None },
             constants.tbreq.SIGNON_PARAM_REPORT:           { self.VALUE: self._getHostReport(),        self.FN: None },
@@ -221 +222 @@
         os.environ['TESTBOX_MEM_SIZE']          = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_MEM_SIZE);
         os.environ['TESTBOX_SCRATCH_SIZE']      = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_SCRATCH_SIZE);
+        #TODO: os.environ['TESTBOX_WITH_RAW_MODE']     = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_WITH_RAW_MODE);
+        os.environ['TESTBOX_WITH_RAW_MODE']     = self._withRawModeSupport();
         os.environ['TESTBOX_MANAGER_URL']       = self._oOptions.sTestManagerUrl;
         os.environ['TESTBOX_UUID']              = self._sTestBoxUuid;
@@ -531 +534 @@
             self._oOptions.fHasIoMmu = False;
         return self._oOptions.fHasIoMmu;
+
+    def _withRawModeSupport(self):
+        """
+        Check if the testbox is configured with raw-mode support or not.
+        """
+        if self._oOptions.fWithRawMode is None:
+            self._oOptions.fWithRawMode = True;
+        return self._oOptions.fWithRawMode;
 
     def _getHostReport(self):
@@ -934 +945 @@
                           dest="fHasIoMmu", action="store_false", default=None,
                           help="No I/O MMU available");
+        parser.add_option("--raw-mode",
+                          dest="fWithRawMode", action="store_true", default=None,
+                          help="Use raw-mode on this host.");
+        parser.add_option("--no-raw-mode",
+                          dest="fWithRawMode", action="store_false", default=None,
+                          help="Disables raw-mode tests on this host.");
         parser.add_option("--pidfile",
                           dest="sPidFile", default=None,

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2690 +2690 @@
         return sCpuDesc.startswith("VIA") or sCpuDesc == 'CentaurHauls';
 
+    def hasRawModeSupport(self, fQuiet = False):
+        """
+        Checks if raw-mode is supported by VirtualBox that the testbox is
+        configured for it.
+
+        Returns True / False.
+        Raises no exceptions.
+
+        Note! Differs from the rest in that we don't require the
+              TESTBOX_WITH_RAW_MODE value to match the API.  It is
+              sometimes helpful to disable raw-mode on individual
+              test boxes. (This probably goes for
+        """
+        # The environment variable can be used to disable raw-mode.
+        fEnv = os.environ.get('TESTBOX_WITH_RAW_MODE', None);
+        if fEnv is not None:
+            fEnv = fEnv.lower() not in [ 'false', 'f', 'not', 'no', 'n', '0', ];
+            if fEnv is False:
+                return False;
+
+        # Starting with 5.0 GA / RC2 the API can tell us whether VBox was built
+        # with raw-mode support or not.
+        self.importVBoxApi();
+        if self.fpApiVer >= 5.0:
+            try:
+                fVBox = self.oVBox.systemProperties.rawModeSupported;
+            except:
+                if not fQuiet:
+                    reporter.logXcpt();
+                fVBox = True;
+            if fVBox is False:
+                return False;
+
+        return True;
 
     #

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -671 +671 @@
             reporter.log('Nested paging not supported by the host, skipping it.');
             self.asVirtModes.remove('hwvirt-np');
+
+        if 'raw' in self.asVirtModes and not oTestDrv.hasRawModeSupport():
+            reporter.log('Raw-mode virtualization is not available in this build (or perhaps for this host), skipping it.');
+            self.asVirtModes.remove('raw');
+
         return True;