Changeset 61595 in vbox for trunk/src/VBox

Timestamp:

Jun 8, 2016 8:31:49 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107937

Message:

testboxscript_real.py: Before I forget, make sure we report the tree revision to the testmanager and not the last time we changed the main source file.

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• Makefile.kmk (modified) (1 diff)
• testboxscript_real.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testboxscript/Makefile.kmk

@@ -37 +37 @@
 testboxscript_EXEC_SOURCES = \
         testboxscript.py \
-        testboxscript_real.py \
+        $(testboxscript_0_OUTDIR)/testboxscript_real.py \
         setup.sh
+$(call VBOX_EDIT_VERSION_RULE_FN,testboxscript,testboxscript_real.py)
+
 testboxscript_SOURCES = \
         testboxcommand.py \

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -183 +183 @@
                 self._ddSignOnParams[sItem][self.VALUE] = self._ddSignOnParams[sItem][self.FN]()
 
-        testboxcommons.log('Starting Test Box script (%s)' % __version__)
+        testboxcommons.log('Starting Test Box script (%s)' % (self._getScriptRev(),));
         testboxcommons.log('Test Manager URL: %s' % self._oOptions.sTestManagerUrl,)
         testboxcommons.log('Scratch root path: %s' % self._oOptions.sScratchRoot,)
@@ -590 +590 @@
         The script (subversion) revision number.
         """
-        return __version__[11:-1].strip();
+        sRev = '@VBOX_SVN_REV@';
+        sRev = sRev.strip();            # just in case...
+        try:
+            _ = int(sRev);
+        except:
+            return __version__[11:-1].strip();
+        return sRev;
 
     def _getPythonHexVersion(self):
@@ -690 +696 @@
                     raise Exception('Still exists after deletion, weird.');
             except Exception, oXcpt:
+                # pylint: disable=too-many-boolean-expressions
                 if    fUseTheForce is True \
                   and utils.getHostOs() not in ['win', 'os2'] \