Changeset 98571 in vbox for trunk/src/VBox/ValidationKit/tests/unittests

Timestamp:

Feb 14, 2023 9:34:23 PM (2 years ago)

Author:

vboxsync

Message:

ValKit/tdUnitTest1.py: Provide path defaults in remote-exec mode too, based on test config. bugref:10195

File:

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

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

@@ -383 +383 @@
         self.cFailed    = 0;
 
-        # The source directory where our unit tests live.
+        ## The source directory where our unit tests live.
         # This most likely is our out/ or some staging directory and
         # also acts the source for copying over the testcases to a remote target.
@@ -425 +425 @@
 
         reporter.log2('Detecting paths ...');
-
-        #
-        # Do some sanity checking first.
-        #
-        if self.sMode == 'remote-exec' and not self.sUnitTestsPathSrc: # There is no way we can figure this out automatically.
-            reporter.error('Unit tests source must be specified explicitly for selected mode!');
-            return False;
 
         #
@@ -450 +443 @@
         # Solaris requires special handling because of it's multi arch subdirs.
         #
-        if not self.sVBoxInstallRoot:
+        if not self.sVBoxInstallRoot and self.sMode == 'remote-exec':
+            self.sVBoxInstallRoot = '${CDROM}/${OS}/${ARCH}';
+
+        elif not self.sVBoxInstallRoot:
             self.sVBoxInstallRoot = self.oBuild.sInstallPath;
             if not self.oBuild.isDevBuild() and utils.getHostOs() == 'solaris':
@@ -476 +472 @@
         # The unittests are generally not installed, so look for them.
         #
-        if not self.sUnitTestsPathSrc:
+        if not self.sUnitTestsPathSrc and self.sMode == 'remote-exec':
+            self.sUnitTestsPathSrc = '${CDROM}/testcase/${OS}/${ARCH}';
+
+        elif not self.sUnitTestsPathSrc:
             sBinOrDist = 'dist' if utils.getHostOs() in [ 'darwin', ] else 'bin';
             asCandidates = [
@@ -1016 +1015 @@
             asFilesToRemove.append(sDst);
 
-            # Copy required dependencies to destination.
+            # Copy required dependencies to destination .
+            # Note! The testcases are statically linked, so there are no VBoxRT.dll/so/dylib
+            #       to copy here.  This code can be currently be ignored.
             if self.isRemoteMode():
                 for sLib in self.kdTestCaseDepsLibs:
@@ -1026 +1027 @@
                             self._wrapCopyFile(sSrc, sDst, fModeDeps);
                             asFilesToRemove.append(sDst);
+
+            ## @todo r=bird: The next two are check for _local_ files matching the remote path when in remote-mode.
+            ##               It makes for very confusing reading and is a potential for trouble.
 
             # Copy any associated .dll/.so/.dylib.