Permalink
Browse files

Merged bug 620282, 624634, 619724 from default.

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 6369dc7 + e3e1d22 commit 00a6ca95dc869049bf263c454e6992a349a28f8a @catlee catlee committed Feb 3, 2011
Showing with 15 additions and 50 deletions.
  1. +1 −2 bin/log_uploader.py
  2. +14 −48 process/factory.py
View
@@ -9,7 +9,6 @@
from buildbot.status.builder import Results
from buildbotcustom.process.factory import postUploadCmdPrefix
-from buildbotcustom.misc import reallyShort
def ssh(user, identity, host, remote_cmd, port=22):
devnull = open(os.devnull)
@@ -221,7 +220,7 @@ def formatLog(tmpdir, build):
to_tinderbox_dated=False,
who=getAuthor(build),
revision=build.getProperty('revision')[:12],
- builddir=reallyShort("%s-%s" % (options.branch, platform)),
+ builddir="%s-%s" % (options.branch, platform),
))
else:
buildid = getBuildId(build)
View
@@ -867,19 +867,21 @@ def get_ctors(rc, stdout, stderr):
))
def addLeakTestSteps(self):
- # we want the same thing run a few times here, with different
- # extraArgs
leakEnv = self.env.copy()
leakEnv['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(self.platform)
- for args in [['-register'], ['-CreateProfile', 'default'],
- ['-P', 'default']]:
- self.addStep(AliveTest,
- env=leakEnv,
- workdir='build/%s/_leaktest' % self.mozillaObjdir,
- extraArgs=args,
- warnOnFailure=True,
- haltOnFailure=True
- )
+ self.addStep(AliveTest,
+ env=leakEnv,
+ workdir='build/%s/_leaktest' % self.mozillaObjdir,
+ extraArgs=['-register'],
+ warnOnFailure=True,
+ haltOnFailure=True
+ )
+ self.addStep(AliveTest,
+ env=leakEnv,
+ workdir='build/%s/_leaktest' % self.mozillaObjdir,
+ warnOnFailure=True,
+ haltOnFailure=True
+ )
self.addStep(SetProperty,
command=['python', 'build%s/config/printconfigsetting.py' % self.mozillaDir,
'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
@@ -1356,42 +1358,6 @@ def addLeakTestSteps(self):
warnOnFailure=True,
haltOnFailure=True
)
- # we only want this variable for this test - this sucks
- bloatEnv = leakEnv.copy()
- bloatEnv['XPCOM_MEM_BLOAT_LOG'] = '1'
- self.addStep(AliveTest,
- env=bloatEnv,
- workdir='build/%s/_leaktest' % self.mozillaObjdir,
- logfile='bloat.log',
- warnOnFailure=True,
- haltOnFailure=True
- )
- self.addStep(ShellCommand,
- name='get_bloat_log',
- env=self.env,
- workdir='.',
- command=['wget', '-O', 'bloat.log.old',
- 'http://%s/pub/mozilla.org/%s/tinderbox-builds/mozilla-central-%s/bloat.log' % \
- (self.stageServer, self.productName, self.platform)],
- warnOnFailure=True,
- flunkOnFailure=False
- )
- self.addStep(ShellCommand,
- name='mv_bloat_log',
- env=self.env,
- command=['mv', '%s/_leaktest/bloat.log' % self.mozillaObjdir,
- '../bloat.log'],
- )
- self.addStep(CompareBloatLogs,
- name='compare_bloat_log',
- bloatLog='bloat.log',
- env=self.env,
- workdir='.',
- mozillaDir=self.mozillaDir,
- tbPrint=self.tbPrint,
- warnOnFailure=True,
- haltOnFailure=False
- )
self.addStep(SetProperty,
command=['python', 'build%s/config/printconfigsetting.py' % self.mozillaDir,
'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
@@ -1593,7 +1559,7 @@ def doUpload(self):
product=self.productName,
revision=WithProperties('%(got_revision)s'),
who=WithProperties('%(who)s'),
- builddir=WithProperties('%(builddir)s'),
+ builddir=WithProperties('%(branch)s-%(platform)s'),
buildid=WithProperties('%(buildid)s'),
to_try=True,
to_dated=False,

0 comments on commit 00a6ca9

Please sign in to comment.