Changeset 65377 in vbox

Timestamp:

Jan 19, 2017 6:22:11 PM (8 years ago)

Author:

vboxsync

Message:

ValidationKit: Another path fix for the back trace resolving, for the OS backends we have to use the build root path to search for the debug archive as the scratch path is space to write temporary files to which is empty initially. Use the old scratch path which will contain the build when creating the host specific resolver backend

File:

• trunk/src/VBox/ValidationKit/testdriver/btresolver.py (modified) (4 diffs)

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

@@ -93 +93 @@
         fRc = False;
         try:
-            sDbgArchive = os.path.join(self.sScratchPath, 'bin', 'VirtualBox-dbg.tar.bz2');
+            sDbgArchive = os.path.join(self.sBuildRoot, 'bin', 'VirtualBox-dbg.tar.bz2');
 
             # Extract debug symbol archive if it was found.
@@ -192 +192 @@
             asDSymPaths = [];
 
-            for sDirPath, asDirs, _ in os.walk(self.sScratchPath):
+            for sDirPath, asDirs, _ in os.walk(self.sBuildRoot):
                 for sDir in asDirs:
                     if sDir.endswith('.dSYM'):
@@ -398 +398 @@
         fRc = False;
         try:
-            sDbgArchive = os.path.join(self.sScratchPath, 'bin', 'VirtualBoxDebug.tar.bz2');
+            sDbgArchive = os.path.join(self.sBuildRoot, 'bin', 'VirtualBoxDebug.tar.bz2');
 
             # Extract debug symbol archive if it was found.
@@ -545 +545 @@
         if fRc:
             if self.sTargetOs == 'linux':
-                self.oResolverOs = BacktraceResolverOsLinux(self.sScratchDbgPath, self.sBuildRoot, self.fnLog);
+                self.oResolverOs = BacktraceResolverOsLinux(self.sScratchDbgPath, self.sScratchPath, self.fnLog);
             elif self.sTargetOs == 'darwin':
-                self.oResolverOs = BacktraceResolverOsDarwin(self.sScratchDbgPath, self.sBuildRoot, self.fnLog); # pylint: disable=R0204
+                self.oResolverOs = BacktraceResolverOsDarwin(self.sScratchDbgPath, self.sScratchPath, self.fnLog); # pylint: disable=R0204
             elif self.sTargetOs == 'solaris':
-                self.oResolverOs = BacktraceResolverOsSolaris(self.sScratchDbgPath, self.sBuildRoot, self.fnLog); # pylint: disable=R0204
+                self.oResolverOs = BacktraceResolverOsSolaris(self.sScratchDbgPath, self.sScratchPath, self.fnLog); # pylint: disable=R0204
             else:
                 self.log('The backtrace resolver is not supported on %s' % (self.sTargetOs,));