Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

changeset: 2155:716ae87c9286

parent:      2150:e124a65db3c8
user:        Erick Dransch <edransch@mozilla.com>
date:        Tue Mar 06 12:50:04 2012 -0500
summary:     bug 730050: TryBuildFactory looks in the wrong place for malloc.log. r=bhearsum

changeset:   2156:c10ba6ab4c55
parent:      2155:716ae87c9286
parent:      2154:58e173dcc3f2
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Tue Mar 06 12:50:27 2012 -0500
summary:     Merge production-0.8 back to default just to sync things up.

changeset:   2157:bdd5e90dc50f
user:        Phil Ringnalda <philringnalda@gmail.com>
date:        Wed Mar 07 15:03:51 2012 -0500
summary:     Bug 712538 - leaktest parity on try - r=coop

changeset:   2158:d65002e32e87
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Thu Mar 08 11:12:21 2012 -0500
summary:     Bug 723667. Use talos.zip for tegras and prep work for talos robocop. r=jmaher,bear

--HG--
branch : production-0.8
  • Loading branch information...
commit 071672d8d52e34f56bddc39929a7a8fd645b71f8 2 parents 5e0420f + 116517a
@armenzg armenzg authored
Showing with 71 additions and 52 deletions.
  1. +71 −52 process/factory.py
View
123 process/factory.py
@@ -1261,6 +1261,19 @@ def addLeakTestStepsCommon(self, baseUrl, leakEnv, graphAndUpload):
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(AliveTest(
+ env=leakEnv,
+ workdir='build/%s/_leaktest' % self.mozillaObjdir,
extraArgs=['--trace-malloc', 'malloc.log',
'--shutdown-leaks=sdleak.log'],
timeout=3600, # 1 hour, because this takes a long time on win32
@@ -1391,20 +1404,6 @@ def addLeakTestSteps(self):
leakEnv = self.env.copy()
leakEnv['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(self.platform)
leakEnv['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
- 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.addLeakTestStepsCommon(self.logBaseUrl, leakEnv, True)
def addCheckTestSteps(self):
@@ -1903,23 +1902,11 @@ def addSourceSteps(self):
))
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)
leakEnv['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
- 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
- ))
baseUrl = 'http://%s/pub/mozilla.org/%s/tinderbox-builds/mozilla-central-%s' % \
- (self.stageServer, self.productName, self.platform)
-
+ (self.stageServer, self.productName, self.complete_platform)
self.addLeakTestStepsCommon(baseUrl, leakEnv, False)
def addCodesighsSteps(self):
@@ -7257,6 +7244,11 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
self.ignoreCerts = True
self.remoteTests = remoteTests
self.configOptions = configOptions['suites'][:]
+ try:
+ self.suites = self.configOptions[self.configOptions.index("--activeTests")+1]
+ except:
+ # simple-talos does not use --activeTests
+ self.suites = ""
self.talosCmd = talosCmd
self.customManifest = customManifest
self.customTalos = customTalos
@@ -7441,6 +7433,36 @@ def get_url(build):
ignore_certs=self.ignoreCerts,
name="Download build",
))
+ if '--fennecIDs' in self.configOptions:
+ def get_fennec_ids_url(build):
+ url = build.source.changes[-1].files[0]
+ return url[:-len('fennec-XX.0XX.en-US.android-arm.apk')] + "fennec_ids.txt"
+
+ def get_robocop_url(build):
+ url = build.source.changes[-1].files[0]
+ return url[:-len('fennec-XX.0XX.en-US.android-arm.apk')] + "robocop.apk"
+
+ self.addStep(DownloadFile(
+ url_fn=get_fennec_ids_url,
+ url_property="fennec_ids_url",
+ filename_property="fennec_ids_filename",
+ workdir=self.workdirBase,
+ haltOnFailure=True,
+ ignore_certs=self.ignoreCerts,
+ name="download_fennec_ids",
+ description="Download fennec_ids.txt",
+ ))
+
+ self.addStep(DownloadFile(
+ url_fn=get_robocop_url,
+ url_property='robocop_url',
+ filename_property='robocop_filename',
+ workdir=self.workdirBase + "/build",
+ haltOnFailure=True,
+ ignore_certs=self.ignoreCerts,
+ name='download_robocop',
+ description="Download robocop.apk",
+ ))
def addUnpackBuildSteps(self):
if (self.releaseTester and (self.OS in ('xp', 'vista', 'win7', 'w764'))):
@@ -7610,35 +7632,32 @@ def addSetupSteps(self):
haltOnFailure=True,
))
elif self.remoteTests:
- self.addStep(ShellCommand(
- name='copy_talos',
- command=["cp", "-rv", "/builds/talos-data/talos", "."],
- workdir=self.workdirBase,
- description="copying talos",
- haltOnFailure=True,
- flunkOnFailure=True,
- env=self.env)
- )
- self.addStep(ShellCommand(
- name='copy_fennecmark',
- command=["cp", "-rv", "/builds/talos-data/bench@taras.glek",
- "talos/mobile_profile/extensions/"],
+ self.addStep(DownloadFile(
+ url='http://build.mozilla.org/talos/zips/bug723667.mobile.talos.zip',
+ wget_args=['-O', 'talos.zip'],
workdir=self.workdirBase,
- description="copying fennecmark",
haltOnFailure=True,
- flunkOnFailure=True,
- env=self.env)
- )
- self.addStep(ShellCommand(
- name='copy_pageloader',
- command=["cp", "-rv", "/builds/talos-data/pageloader@mozilla.org",
- "talos/mobile_profile/extensions/"],
+ description="Download talos.zip",
+ ))
+ self.addStep(UnpackFile(
+ filename='talos.zip',
workdir=self.workdirBase,
- description="copying pageloader",
haltOnFailure=True,
- flunkOnFailure=True,
- env=self.env)
- )
+ description="Unpack talos.zip",
+ ))
+ if self.suites.find('tp4m') != -1:
+ self.addStep(DownloadFile(
+ url='http://build.mozilla.org/talos/zips/mobile_tp4.zip',
+ workdir=self.workdirBase + "/talos",
+ haltOnFailure=True,
+ description="Download mobile_tp4.zip",
+ ))
+ self.addStep(UnpackFile(
+ filename='mobile_tp4.zip',
+ workdir=self.workdirBase + "/talos",
+ haltOnFailure=True,
+ description="Unpack mobile_tp4.zip",
+ ))
else:
self.addStep(FileDownload(
mastersrc=self.customTalos,
Please sign in to comment.
Something went wrong with that request. Please try again.