Changeset 98074 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Jan 13, 2023 1:08:38 PM (2 years ago)

Author:

vboxsync

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

155202

Message:

Validation Kit/tdUnitTest1.py: Fixed running locally on Windows (hosts).

File:

• trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py (modified) (12 diffs)

trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py

@@ -977 +977 @@
         return True;
 
-    def _executeTestCase(self, oTestVm, sName, sFullPath, sTestCaseSubDir, oDevNull): # pylint: disable=too-many-locals,too-many-statements
+    def _executeTestCase(self, oTestVm, sName, sFilePathAbs, sTestCaseSubDir, oDevNull): # pylint: disable=too-many-locals,too-many-statements
         """
         Executes a test case.
+
+        sFilePathAbs contains the absolute path (including OS-dependent executable suffix) of the testcase.
+
+        Returns @c true if testcase was skipped, or @c if not.
         """
 
@@ -1005 +1009 @@
                 asDirsToRemove.append(sDstDir);
 
-            sSrc = sFullPath + self.sExeSuff;
+            sSrc = sFilePathAbs;
             # If the testcase source does not exist for whatever reason, just mark it as skipped
             # instead of reporting an error.
@@ -1013 +1017 @@
                 return fSkipped;
 
-            sDst = os.path.join(sDstDir, os.path.basename(sFullPath) + self.sExeSuff);
+            sDst = os.path.join(sDstDir, os.path.basename(sFilePathAbs));
             fModeExe  = 0;
             fModeDeps = 0;
@@ -1035 +1039 @@
             # Copy any associated .dll/.so/.dylib.
             for sSuff in [ '.dll', '.so', '.dylib' ]:
-                sSrc = os.path.splitext(sFullPath)[0] + sSuff;
+                sSrc = os.path.splitext(sFilePathAbs)[0] + sSuff;
                 if os.path.exists(sSrc):
                     sDst = os.path.join(sDstDir, os.path.basename(sSrc));
@@ -1042 +1046 @@
 
             # Copy any associated .r0, .rc and .gc modules.
-            offDriver = sFullPath.rfind('Driver')
+            offDriver = sFilePathAbs.rfind('Driver')
             if offDriver > 0:
                 for sSuff in [ '.r0', 'RC.rc', 'RC.gc' ]:
-                    sSrc = sFullPath[:offDriver] + sSuff;
+                    sSrc = sFilePathAbs[:offDriver] + sSuff;
                     if os.path.exists(sSrc):
                         sDst = os.path.join(sDstDir, os.path.basename(sSrc));
@@ -1051 +1055 @@
                         asFilesToRemove.append(sDst);
 
-            sFullPath = os.path.join(sDstDir, os.path.basename(sFullPath));
+            sFilePathAbs = os.path.join(sDstDir, os.path.basename(sFilePathAbs));
 
         #
         # Set up arguments and environment.
         #
-        asArgs = [sFullPath + self.sExeSuff,]
+        asArgs = [sFilePathAbs,]
         if sName in self.kdArguments:
             asArgs.extend(self.kdArguments[sName]);
@@ -1139 +1143 @@
 
         if iRc == 0:
-            reporter.log('*** %s: exit code %d' % (sFullPath, iRc));
+            reporter.log('*** %s: exit code %d' % (sFilePathAbs, iRc));
             self.cPassed += 1;
 
         elif iRc == 4: # RTEXITCODE_SKIPPED
-            reporter.log('*** %s: exit code %d (RTEXITCODE_SKIPPED)' % (sFullPath, iRc));
+            reporter.log('*** %s: exit code %d (RTEXITCODE_SKIPPED)' % (sFilePathAbs, iRc));
             fSkipped = True;
             self.cSkipped += 1;
 
         elif fSkipped:
-            reporter.log('*** %s: exit code %d (Skipped)' % (sFullPath, iRc));
+            reporter.log('*** %s: exit code %d (Skipped)' % (sFilePathAbs, iRc));
             self.cSkipped += 1;
 
@@ -1160 +1164 @@
             if iRc != 1:
                 reporter.testFailure('Exit status: %d%s' % (iRc, sName));
-                reporter.log(  '!*! %s: exit code %d%s' % (sFullPath, iRc, sName));
+                reporter.log(  '!*! %s: exit code %d%s' % (sFilePathAbs, iRc, sName));
             else:
-                reporter.error('!*! %s: exit code %d%s' % (sFullPath, iRc, sName));
+                reporter.error('!*! %s: exit code %d%s' % (sFilePathAbs, iRc, sName));
             self.cFailed += 1;
 
@@ -1203 +1207 @@
 
         for sFilename in asFiles:
+            # When executing in remote execution mode, make sure to append the executable suffix here, as
+            # the (white / black) lists do not contain any OS-specific executable suffixes.
+            if self.sMode in ('remote-exec'):
+                sFilename = sFilename + self.sExeSuff;
             # Separate base and suffix and morph the base into something we
             # can use for reporting and array lookups.
@@ -1214 +1222 @@
 
             # Process white list first, if set.
-            if self.fOnlyWhiteList  and  not self._isExcluded(sName, self.kdTestCasesWhiteList):
+            if  self.fOnlyWhiteList \
+            and not self._isExcluded(sName, self.kdTestCasesWhiteList):
                 # (No testStart/Done or accounting here!)
                 reporter.log('%s: SKIPPED (not in white list)' % (sName,));
@@ -1220 +1229 @@
 
             # Basic exclusion.
-            if  not re.match(sTestCasePattern, sBaseName)  or  sSuffix in self.kasSuffixBlackList:
+            if  not re.match(sTestCasePattern, sBaseName) \
+            or  sSuffix in self.kasSuffixBlackList:
                 reporter.log2('"%s" is not a test case.' % (sName,));
                 continue;
@@ -1249 +1259 @@
                 pass;
 
-            sFullPath = os.path.normpath(os.path.join(self.sUnitTestsPathSrc, os.path.join(sTestCaseSubDir, sFilename)));
+            sFilePathAbs = os.path.normpath(os.path.join(self.sUnitTestsPathSrc, os.path.join(sTestCaseSubDir, sFilename)));
+            reporter.log2('sFilePathAbs=%s\n' % (sFilePathAbs,));
             reporter.testStart(sName);
             try:
-                fSkipped = self._executeTestCase(oTestVm, sName, sFullPath, sTestCaseSubDir, oDevNull);
+                fSkipped = self._executeTestCase(oTestVm, sName, sFilePathAbs, sTestCaseSubDir, oDevNull);
             except:
                 reporter.errorXcpt('!*!');