Permalink
Browse files

changeset: 1530:6812cce361f7

parent:      1528:19c634c3114a
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Fri May 13 14:23:30 2011 -0700
summary:     bug 655046 - fix mobile try sendchange user + upload directory. r=lsblakk

changeset:   1531:a17ffa81c75c
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri May 13 17:43:32 2011 -0400
summary:     Bug 648604 - Enable OpenGL reftests for linux machines. r=lsblakk

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 5d29c59 + e550cbe commit 79d20455017f0434d7f30df97bf5909fbf3a0308 @armenzg armenzg committed May 16, 2011
Showing with 11 additions and 4 deletions.
  1. +8 −4 process/factory.py
  2. +3 −0 steps/unittest.py
View
@@ -6503,7 +6503,7 @@ def addMakeUploadSteps(self, subdir=None, sendchange=True,
uploadArgs['to_tinderbox_dated'] = False
uploadArgs['revision'] = WithProperties('%(got_revision)s')
uploadArgs['who'] = WithProperties('%(who)s')
- uploadArgs['builddir'] = WithProperties('%(builddir)s')
+ uploadArgs['builddir'] = tinderboxBuildsDir
else:
uploadArgs['to_tinderbox_dated'] = True
if subdir:
@@ -6535,6 +6535,9 @@ def addMakeUploadSteps(self, subdir=None, sendchange=True,
sendchangePlatform = 'android'
if 'linux' in self.platform:
sendchangePlatform = 'linux'
+ user = "sendchange"
+ if self.enable_try:
+ user = WithProperties("%(who)s")
if len(self.talosMasters) > 0 and sendchange:
talosBranch = "%s-%s-talos" % (self.branchName, sendchangePlatform)
for master, warn, retries in self.talosMasters:
@@ -6546,7 +6549,7 @@ def addMakeUploadSteps(self, subdir=None, sendchange=True,
branch=talosBranch,
revision=WithProperties("%(got_revision)s"),
files=[WithProperties('%(packageUrl)s')],
- user="sendchange")
+ user=user)
)
if len(self.unittestMasters) > 0 and sendchange:
unittestType = 'mobile' if 'linux' in self.platform else 'opt'
@@ -6563,7 +6566,7 @@ def addMakeUploadSteps(self, subdir=None, sendchange=True,
revision=WithProperties("%(got_revision)s"),
files=[WithProperties('%(packageUrl)s'),
WithProperties('%(testsUrl)s')],
- user="sendchange",
+ user=user,
))
def addMultiLocaleSteps(self, scriptName="mozharness/scripts/multil10n.py"):
@@ -7191,7 +7194,8 @@ def addRunTestSteps(self):
maxTime=120*60, # Two Hours
))
elif suite in ('reftest', 'reftest-ipc', 'reftest-d2d', 'crashtest', \
- 'crashtest-ipc', 'direct3D', 'opengl', 'reftest-no-d2d-d3d'):
+ 'crashtest-ipc', 'direct3D', 'opengl', 'opengl-no-accel', \
+ 'reftest-no-d2d-d3d'):
if suite in ('direct3D', 'opengl'):
self.env.update({'MOZ_ACCELERATED':'11'})
if suite in ('reftest-ipc', 'crashtest-ipc'):
View
@@ -297,6 +297,9 @@ def getSuiteOptions(self, suite):
return ['--setpref=gfx.direct2d.disabled=true',
'--setpref=layers.accelerate-none=true',
'reftest/tests/layout/reftests/reftest.list']
+ elif suite == 'opengl-no-accel':
+ return ['--setpref=layers.acceleration.force-enabled=disabled',
+ 'reftest/tests/layout/reftests/reftest.list']
elif suite == 'jsreftest':
return ['--extra-profile-file=jsreftest/tests/user.js',
'jsreftest/tests/jstests.list']

0 comments on commit 79d2045

Please sign in to comment.