Changeset 95762 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Jul 20, 2022 7:02:32 PM (2 years ago)

Author:

vboxsync

Message:

ValKit/vboxinstaller.py: Implemented the installer parameter support detection, getting rid of the idea that 6.1 and trunk always supported --msi-log-file. bugref:8691

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (2 diffs)

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

@@ -915 +915 @@
             return None; # There shouldn't be anything to uninstall, and if there is, it's not our fault.
 
-        fGreaterOrEqual61 = True; ## @todo Parse the --version output from the executable.
-        fSupportsForceTsCAInstall = True; ## @todo Parse the --help output.
+        # We need the help text to detect supported options below.
+        reporter.log('Executing: %s' % ([sExe, '--silent', '--help'], ));
+        reporter.flushall();
+        (iExitCode, sHelp, _) = utils.processOutputUnchecked([sExe, '--silent', '--help'], fIgnoreEncoding = True);
+        reporter.log('Exit code: %d, %u chars of help text' % (iExitCode, len(sHelp),));
 
         # Gather installer arguments.
@@ -925 +928 @@
             asArgs.extend(['INSTALLDIR="%s"' % (sVBoxInstallPath,)]);
 
-        if fGreaterOrEqual61:
-            # We need to explicitly specify the location, otherwise the log would end up at a random location.
-            sLogFile = os.path.join(tempfile.gettempdir(), 'VBoxInstallLog.txt');
+        if sHelp.find("--msi-log-file") >= 0:
+            ## @todo why do we use the TMP dir?  This belongs in the scratch dir (which may be a lot faster than TMP).
+            sLogFile = os.path.join(tempfile.gettempdir(), 'VBoxInstallLog.txt'); # Specify location to prevent a random one.
             asArgs.extend(['--msi-log-file', sLogFile]);
-        else: # Prior to 6.1 the location was hardcoded.
-            sLogFile = os.path.join(tempfile.gettempdir(), 'VirtualBox', 'VBoxInstallLog.txt');
-
-        if fSupportsForceTsCAInstall and self._fWinForcedInstallTimestampCA:
+        else:
+            sLogFile = os.path.join(tempfile.gettempdir(), 'VirtualBox', 'VBoxInstallLog.txt'); # Hardcoded TMP location.
+
+        if self._fWinForcedInstallTimestampCA and sHelp.find("--force-install-timestamp-ca") >= 0:
             asArgs.extend(['--force-install-timestamp-ca']);