Changeset 94506 in vbox for trunk/src

Timestamp:

Apr 7, 2022 7:32:16 AM (3 years ago)

Author:

vboxsync

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

150849

Message:

Validation Kit/unit tests: Determine the executable suffixes right before running the unit tests, as this needs to be handled when we also know the guest OS' type. ​bugref:10195

File:

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

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

@@ -380 +380 @@
         self.sUnitTestsPathDst = None;
 
-        self.sExeSuff   = '.exe' if utils.getHostOs() in [ 'win', 'dos', 'os2' ] else '';
+        # Will be determined before executing the actual unit tests.
+        self.sExeSuff   = '';
 
         self.aiVBoxVer  = (4, 3, 0, 0);
@@ -623 +624 @@
         Main function to execute all unit tests.
         """
+
+        # Determine executable suffix based on selected execution mode.
+        if self.sMode.startswith('remote'): # Run on a test VM (guest).
+            if oTestVm.isWindows():
+                self.sExeSuff = '.exe';
+            else:
+                self.sExeSuff = '';
+        else:
+            self.sExeSuff = '.exe' if utils.getHostOs() in [ 'win', 'dos', 'os2' ] else '';
+
         self._testRunUnitTestsSet(r'^tst*', 'testcase');
         self._testRunUnitTestsSet(r'^tst*', '.');
@@ -937 +948 @@
 
             sDst = os.path.join(sDstDir, os.path.basename(sFullPath));
-            self._wrapCopyFile(sFullPath, sDst, 0o755);
+            self._wrapCopyFile(sFullPath + self.sExeSuff, sDst, 0o755);
             asFilesToRemove.append(sDst);
 
@@ -1129 +1140 @@
                 sName = sTestCaseSubDir + '/' + sName;
 
-            reporter.log2('sTestCasePattern=%s, sBaseName=%s, sName=%s, sFileName=%s' \
-                          % (sTestCasePattern, sBaseName, sName, sFilename,));
+            reporter.log2('sTestCasePattern=%s, sBaseName=%s, sName=%s, sSuffix=%s, sFileName=%s' \
+                          % (sTestCasePattern, sBaseName, sName, sSuffix, sFilename,));
 
             # Process white list first, if set.