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

Timestamp:

Feb 14, 2023 1:57:32 PM (22 months ago)

Author:

vboxsync

Message:

ValKit/tdUnitTest1.py: Use a dictionary for enviornment variables, not a list, because it will grow too long and triggers TXS enviornment limit check. bugref:10195

File:

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

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

@@ -385 +385 @@
         self.sUnitTestsPathSrc = None;
 
-        # Array of environment variables with NAME=VAL entries
-        # to be applied for testcases.
-        #
-        # This is also needed for testcases which are being executed remotely.
-        self.asEnv = [];
+        ## Remote environment changes.
+        self.dRemoteEnvChg = {};
 
         # The destination directory our unit tests live when being
@@ -970 +967 @@
     def _envSet(self, sName, sValue):
         if self.isRemoteMode():
-            # For remote execution we cache the environment block and pass it
-            # right when the process execution happens.
-            self.asEnv.append([ sName, sValue ]);
+            self.dRemoteEnvChg[sName] = sValue;
         else:
             os.environ[sName] = sValue;
@@ -1067 +1062 @@
 
         self._envSet('IPRT_TEST_OMIT_TOP_TEST', '1');
-        self._envSet('IPRT_TEST_FILE', sXmlFile);
+        self._envSet('IPRT_TEST_FILE', sXmlFile);  ## @todo skip for remote. Makes _no_ sense.
 
         if self._wrapPathExists(sXmlFile):
@@ -1091 +1086 @@
         if not self.fDryRun:
             if fCopyToRemote:
+                asRemoteEnvChg = ['%s=%s' % (sKey, self.dRemoteEnvChg[sKey]) for sKey in self.dRemoteEnvChg];
                 fRc = self.txsRunTest(self.oTxsSession, sName, cMsTimeout = 30 * 60 * 1000, sExecName = asArgs[0],
-                                      asArgs = asArgs, asAddEnv = self.asEnv, fCheckSessionStatus = True);
+                                      asArgs = asArgs, asAddEnv = asRemoteEnvChg, fCheckSessionStatus = True);
                 if fRc:
                     iRc = 0;