Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merging from default

changeset:   3105:21ea12b25bdb
parent:      3100:1fb64f0d7067
user:        Nick Thomas <nthomas@mozilla.com>
date:        Wed Apr 10 16:27:37 2013 +1200
summary:     Backout 1fb64f0d7067 (bug 854758) for being the wrong fix

changeset:   3107:eff46a18a2ed
parent:      3105:21ea12b25bdb
user:        Justin Wood <Callek@gmail.com>
date:        Wed Apr 03 13:01:50 2013 -0400
summary:     Bug 725703 - tests should figure out the app name for fennec instead of hardcoding everywhere. r=aki

changeset:   3108:bff9a24edcf1
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Thu Apr 11 12:16:39 2013 -0400
summary:     Bug 770578. Add win7-ix and xp-ix to the list of platforms using Python27. r=coop

--HG--
branch : production-0.8
  • Loading branch information...
commit 4d7e8f7d04ea6d05fd29f50a8cc5eba03e907f43 2 parents c9438a9 + a66a9ca
Rail Aliiev rail authored
Showing with 30 additions and 51 deletions.
  1. +1 −1  misc.py
  2. +17 −34 process/factory.py
  3. +3 −5 steps/talos.py
  4. +9 −11 steps/unittest.py
2  misc.py
View
@@ -1855,7 +1855,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
opt_talos_branch = talosBranch
factory_kwargs = {
- "OS": slave_platform.split('-')[0],
+ "OS": slave_platform,
"supportUrlBase": branch_config['support_url_base'],
"envName": platform_config['env_name'],
"workdirBase": "../talos-data",
51 process/factory.py
View
@@ -5112,8 +5112,6 @@ def addRunTestSteps(self):
self.env.update({'MOZ_ACCELERATED': '11'})
if suite in ('reftest-ipc', 'crashtest-ipc'):
self.env.update({'MOZ_LAYERS_FORCE_SHMEM_SURFACES': '1'})
- self.env.update({'MOZ_DISABLE_CONTEXT_SHARING_GLX': '1',
- 'MOZ_OMTC_ENABLED': '1'})
# Unpack the tests
self.addStep(UnpackTest(
filename=WithProperties('%(tests_filename)s'),
@@ -5240,15 +5238,6 @@ def __init__(self, platform, suites, hostUtils, productName='fennec',
else:
self.remoteExtras = {}
- exePaths = self.remoteExtras.get('processName', {})
- if branchName in exePaths:
- self.remoteProcessName = exePaths[branchName]
- else:
- if 'default' in exePaths:
- self.remoteProcessName = exePaths['default']
- else:
- self.remoteProcessName = 'org.mozilla.fennec'
-
env = {}
env['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(platform)
env['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
@@ -5311,7 +5300,7 @@ def addSetupSteps(self):
command=['python', '/builds/sut_tools/installApp.py',
WithProperties("%(sut_ip)s"),
WithProperties("build/%(build_filename)s"),
- self.remoteProcessName,
+ WithProperties("%(remoteProcessName)s"),
],
haltOnFailure=True)
)
@@ -5339,6 +5328,11 @@ def get_build_url(build):
workdir='build/%s' % self.productName,
name='unpack_build',
))
+ self.addStep(SetProperty(
+ command=['cat', 'package-name.txt'],
+ workdir='build/%s' % self.productName,
+ property='remoteProcessName'
+ ))
def get_robocop_url(build):
'''We assume 'robocop.apk' is in same directory as the
@@ -5389,7 +5383,7 @@ def addRunTestSteps(self):
],
haltOnFailure=True)
)
- if name.startswith('mochitest'):
+ if name.startswith('mochitest'):
# XXX Hack for Bug 811444
# Slow down tests for panda boards
def ifAPanda(build):
@@ -5422,12 +5416,11 @@ def ifAPanda(build):
slowTests=WithProperties('%(slowTests)s'),
workdir='build/tests',
timeout=2400,
- app=self.remoteProcessName,
env=self.env,
log_eval_func=lambda c, s: regex_log_evaluator(c, s,
global_errors + tegra_errors),
))
-
+
else:
totalChunks = suite.get('totalChunks', None)
thisChunk = suite.get('thisChunk', None)
@@ -5438,7 +5431,6 @@ def ifAPanda(build):
slowTests=WithProperties('%(slowTests)s'),
workdir='build/tests',
timeout=2400,
- app=self.remoteProcessName,
env=self.env,
totalChunks=totalChunks,
thisChunk=thisChunk,
@@ -5488,7 +5480,6 @@ def ifAPanda(build):
extra_args=extra_args,
workdir='build/tests',
timeout=2400,
- app=self.remoteProcessName,
env=self.env,
cmdOptions=self.remoteExtras.get('cmdOptions'),
log_eval_func=lambda c, s: regex_log_evaluator(
@@ -5511,7 +5502,6 @@ def ifAPanda(build):
thisChunk=thisChunk,
workdir='build/tests',
timeout=2400,
- app=self.remoteProcessName,
env=self.env,
cmdOptions=self.remoteExtras.get('cmdOptions'),
log_eval_func=lambda c, s: regex_log_evaluator(
@@ -5592,18 +5582,6 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
else:
self.talosBranch = talosBranch
- if self.remoteExtras is not None:
- exePaths = self.remoteExtras.get('processName', {})
- else:
- exePaths = {}
- if branch in exePaths:
- self.remoteProcessName = exePaths[branch]
- else:
- if 'default' in exePaths:
- self.remoteProcessName = exePaths['default']
- else:
- self.remoteProcessName = 'org.mozilla.fennec'
-
self.addInfoSteps()
if self.remoteTests:
self.addMobileCleanupSteps()
@@ -5635,7 +5613,7 @@ def pythonWithJson(self, platform):
return "/tools/buildbot/bin/python"
elif (platform in ('w764', 'win7', 'xp')):
return "C:\\mozilla-build\\python25\\python.exe"
- elif (platform in ('win8',)):
+ elif (platform in ('win8', 'win7-ix', 'xp-ix')):
return "C:\\mozilla-build\\python27\\python.exe"
elif (platform.find("android") > -1):
# path in the foopies
@@ -5829,6 +5807,12 @@ def addUnpackBuildSteps(self):
name="Unpack build",
haltOnFailure=True,
))
+ self.addStep(SetProperty(
+ command=['cat', 'package-name.txt'],
+ workdir='%s/%s' % (
+ self.workdirBase, self.productName),
+ property='remoteProcessName'
+ ))
else:
self.addStep(UnpackFile(
filename=WithProperties("%(filename)s"),
@@ -6181,7 +6165,7 @@ def addPrepareDeviceStep(self):
command=['python', '/builds/sut_tools/installApp.py',
WithProperties("%(sut_ip)s"),
WithProperties(self.workdirBase + "/%(filename)s"),
- self.remoteProcessName,
+ WithProperties("%(remoteProcessName)s"),
],
env=self.env,
haltOnFailure=True)
@@ -6200,8 +6184,7 @@ def addUpdateConfigStep(self):
extName=TalosFactory.extName,
useSymbols=self.fetchSymbols,
remoteExtras=self.remoteExtras,
- remoteProcessName=self.remoteProcessName)
- )
+ ))
def addRunTestStep(self):
if self.OS in ('mountainlion', 'lion', 'snowleopard'):
8 steps/talos.py
View
@@ -15,7 +15,7 @@ class MozillaUpdateConfig(ShellCommand):
def __init__(self, branch, branchName, executablePath,
addOptions=None, useSymbols=False,
remoteTests=False, extName=None, remoteExtras=None,
- remoteProcessName=None, **kwargs):
+ **kwargs):
if addOptions is None:
self.addOptions = []
@@ -27,7 +27,6 @@ def __init__(self, branch, branchName, executablePath,
else:
self.remoteExtras = {}
- self.remoteProcessName = remoteProcessName
self.remoteOptions = self.remoteExtras.get('options', [])
self.branch = branch
@@ -44,8 +43,7 @@ def __init__(self, branch, branchName, executablePath,
branchName=branchName, executablePath=executablePath,
remoteTests=remoteTests, useSymbols=useSymbols,
extName=extName,
- remoteExtras=self.remoteExtras,
- remoteProcessName=remoteProcessName)
+ remoteExtras=self.remoteExtras)
def setBuild(self, build):
self.super_class.setBuild(self, build)
@@ -62,7 +60,7 @@ def setBuild(self, build):
self.addOptions += ['--symbolsPath', '../symbols']
if self.remoteTests:
- exePath = self.remoteProcessName
+ exePath = WithProperties("%(remoteProcessName)s")
perfconfigurator = "remotePerfConfigurator.py"
self.addOptions += ['--remoteDevice',
WithProperties('%(sut_ip)s'), ]
20 steps/unittest.py
View
@@ -364,14 +364,12 @@ def getSuiteOptions(self, suite):
return ['reftest/tests/testing/crashtest/crashtests.list']
elif suite == 'crashtest-ipc':
return ['--setpref=browser.tabs.remote=true',
- '--setpref=layers.offmainthreadcomposition.testing.enabled=true',
'reftest/tests/testing/crashtest/crashtests.list']
elif suite in ('reftest', 'direct3D', 'opengl', 'reftestsmall'):
return ['reftest/tests/layout/reftests/reftest.list']
elif suite in ('reftest-ipc'):
# See bug 637858 for why we are doing a subset of all reftests
return ['--setpref=browser.tabs.remote=true',
- '--setpref=layers.offmainthreadcomposition.testing.enabled=true',
'reftest/tests/layout/reftests/reftest-sanity/reftest.list']
elif suite == 'reftest-d2d':
return ['--setpref=gfx.font_rendering.directwrite.enabled=true',
@@ -625,8 +623,8 @@ class RemoteMochitestStep(MochitestMixin, ChunkingMixin, ShellCommandReportTimeo
def __init__(self, variant, symbols_path=None, testPath=None,
xrePath='../hostutils/xre', testManifest=None,
utilityPath='../hostutils/bin', certificatePath='certs',
- app='org.mozilla.fennec', consoleLevel='INFO',
- totalChunks=None, thisChunk=None, slowTests=False, **kwargs):
+ consoleLevel='INFO', totalChunks=None, thisChunk=None,
+ slowTests=False, **kwargs):
self.super_class = ShellCommandReportTimeout
ShellCommandReportTimeout.__init__(self, **kwargs)
@@ -636,7 +634,7 @@ def __init__(self, variant, symbols_path=None, testPath=None,
self.addFactoryArguments(variant=variant, symbols_path=symbols_path,
testPath=testPath, xrePath=xrePath,
testManifest=testManifest, utilityPath=utilityPath,
- certificatePath=certificatePath, app=app,
+ certificatePath=certificatePath,
consoleLevel=consoleLevel, slowTests=slowTests,
totalChunks=totalChunks, thisChunk=thisChunk)
@@ -646,7 +644,7 @@ def __init__(self, variant, symbols_path=None, testPath=None,
'--xre-path', xrePath,
'--utility-path', utilityPath,
'--certificate-path', certificatePath,
- '--app', app,
+ '--app', WithProperties("%(remoteProcessName)s"),
'--console-level', consoleLevel,
'--http-port', WithProperties('%(http_port)s'),
'--ssl-port', WithProperties('%(ssl_port)s'),
@@ -672,7 +670,7 @@ def start(self):
slowTests = properties.render(self.slowTests)
if slowTests == str(True):
self.command.append(['--run-slower'])
- ShellCommandReportTimeout.start(self)
+ self.super_class.start(self)
class RemoteMochitestBrowserChromeStep(RemoteMochitestStep):
@@ -692,13 +690,13 @@ def evaluateCommand(self, cmd):
class RemoteReftestStep(ReftestMixin, ChunkingMixin, ShellCommandReportTimeout):
def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
- utilityPath='../hostutils/bin', app='org.mozilla.fennec',
- totalChunks=None, thisChunk=None, cmdOptions=None, extra_args=None, **kwargs):
+ utilityPath='../hostutils/bin', totalChunks=None,
+ thisChunk=None, cmdOptions=None, extra_args=None, **kwargs):
self.super_class = ShellCommandReportTimeout
ShellCommandReportTimeout.__init__(self, **kwargs)
self.addFactoryArguments(suite=suite, xrePath=xrePath,
symbols_path=symbols_path,
- utilityPath=utilityPath, app=app,
+ utilityPath=utilityPath,
totalChunks=totalChunks, thisChunk=thisChunk,
cmdOptions=cmdOptions, extra_args=extra_args)
@@ -709,7 +707,7 @@ def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
'--deviceIP', WithProperties('%(sut_ip)s'),
'--xre-path', xrePath,
'--utility-path', utilityPath,
- '--app', app,
+ '--app', WithProperties("%(remoteProcessName)s"),
'--http-port', WithProperties('%(http_port)s'),
'--ssl-port', WithProperties('%(ssl_port)s'),
'--pidfile', WithProperties(
Please sign in to comment.
Something went wrong with that request. Please try again.