Use a portable way to figure out where mozillas objdir is
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Fri, 31 Oct 2008 11:15:52 -0400
changeset 479 3a2e8bea7d5b9e758341acd0dd25c302b38dece3
parent 478 2aeadbb313266f7bfc59d5ab3a771d44b3e7b4af
child 480 13891deedb6df7924ffe994e85227581881388fd
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
Use a portable way to figure out where mozillas objdir is
thunderbird/mozillaleak.py
--- a/thunderbird/mozillaleak.py
+++ b/thunderbird/mozillaleak.py
@@ -1,10 +1,11 @@
 from buildbot.steps.shell import Compile, ShellCommand
 
+import os.path
 
 import buildbotcustom.steps.misc
 import buildbotcustom.steps.test
 import buildbotcustom.steps.transfer
 import buildbotcustom.steps.updates
 reload(buildbotcustom.steps.misc)
 reload(buildbotcustom.steps.test)
 reload(buildbotcustom.steps.transfer)
@@ -16,16 +17,17 @@ from buildbotcustom.steps.test import Al
 from buildbotcustom.steps.transfer import MozillaStageUpload
 from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
 
 def addLeakTestSteps(self,branch,platform,platformName):
         # we want the same thing run a few times here, with different
         # extraArgs
         env = platform['env']
         objdir = platform['platform_objdir']
+        moz_objdir = os.path.join(objdir, 'mozilla')
         leak_threshold = platform.get('leak_threshold', branch.get('leak_threshold', 7261838))
         self.addStep(ShellCommand,
             description=['run leak tests'],
             env=env,
             command=['perl','mailnews/test/performance/bloat/runtest.pl',objdir],
         )
         self.addStep(ShellCommand,
          env=env,
@@ -46,32 +48,32 @@ def addLeakTestSteps(self,branch,platfor
          env=env,
          command=['cp', 'sdleak.log', '../sdleak.log',],
         )
         self.addStep(CompareLeakLogs,
          mallocLog='../malloc.log',
          platform=platformName,
          leakFailureThreshold=leak_threshold,
          env=env,
-         objdir='objdir-tb/mozilla',
+         objdir=moz_objdir,
          testname='current',
          testnameprefix='Mail'
         )
 #        self.addStep(GraphServerPost,
 #         server=self.graphServer,
 #         selector=self.graphSelector,
 #         branch=self.graphBranch,
 #         resultsname=self.baseName
 #        )
         self.addStep(CompareLeakLogs,
          mallocLog='../malloc.log.old',
          platform=platformName,
          leakFailureThreshold=leak_threshold,
          env=env,
-         objdir="objdir-tb/mozilla",
+         objdir=moz_objdir,
          testname='previous',
          testnameprefix='Mail'
         )
         self.addStep(ShellCommand,
          env=env,
          workdir='.',
          command=['bash', '-c',
                   'perl build/mozilla/tools/trace-malloc/diffbloatdump.pl '