Changeset 86438 in vbox for trunk

Timestamp:

Oct 4, 2020 11:36:35 AM (4 years ago)

Author:

vboxsync

Message:

testdriver/vbox.py: Undo libasan.so.X preloading and memory leak detection disabling from vboxinstaller.py. Also, try use VBoxManage --dump-build-type to figure out the build type instead of assuming everything is a release build. bugref:9841

File:

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

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

@@ -460 +460 @@
             self.sDesignation = os.environ.get('TEST_BUILD_DESIGNATION', 'XXXXX');
             ## @todo Much more work is required here.
+
+            # Determine the build type.
+            (iExit, sStdOut, sStdErr) = utils.processOutputUnchecked([os.path.join(self.sInstallPath,
+                                                                                   'VBoxManage' + base.exeSuff()),
+                                                                      '--dump-build-type']);
+            sStdOut = sStdOut.strip();
+            if iExit == 0 and sStdOut in ('release', 'debug', 'strict', 'dbgopt', 'asan'):
+                self.sType = sStdOut;
+                reporter.log2('build type: %s' % (self.sType));
+            else:
+                reporter.log2('--dump-build-type -> iExit=%u sStdOut=%s' % (iExit, sStdOut,));
 
             # Do some checks.
@@ -873 +884 @@
         self.fAlwaysUploadScreenshots = False;
         self.fEnableDebugger          = True;
+
+        # Drop LD_PRELOAD and enable memory leak detection in LSAN_OPTIONS from vboxinstall.py
+        # before doing build detection. This is a little crude and inflexible...
+        if 'LD_PRELOAD' in os.environ:
+            del os.environ['LD_PRELOAD'];
+            if 'LSAN_OPTIONS' in os.environ:
+                asLSanOptions = os.environ['LSAN_OPTIONS'].split(':');
+                try:    asLSanOptions.remove('detect_leaks=0');
+                except: pass;
+                if asLSanOptions: os.environ['LSAN_OPTIONS'] = ':'.join(asLSanOptions);
+                else:         del os.environ['LSAN_OPTIONS'];
 
         # Quietly detect build and validation kit.