--- a/common.py
+++ b/common.py
@@ -90,36 +90,27 @@ def normalizeName(name, product=None, mi
'inbound': 'in',
'services': 'srv',
'gecko': 'g',
'localizer': 'lz',
'blocklistupdate': 'blu',
'armv6': 'a6',
'armv7a': 'a7',
'system': 'sys',
- 'b2g37': 'b37',
- 'b2g44': 'b44',
- 'v2_5': '25',
'standalone': 'sa',
'thunderbird': 'tb',
'partner': 'pner',
'checksums': 'sums',
'postrelease': 'pr',
'spidermonkey': 'sm',
'warnaserr': 'we',
'warnaserrdebug': 'wed',
'rootanalysis': 'ra',
'generational': 'ggc',
- 'emulator': 'emu',
- 'hamachi': 'ham',
- 'wasabi': 'wsb',
'graphics': 'gfx',
- 'flame': 'flm',
- 'dolphin': 'dph',
- 'nexus-5': 'n5',
'firefox_tag_source': 'fx_tag_src',
'firefox_tag_l10n': 'fx_tag_l10n',
'firefox': 'fx',
'fennec_tag_source': 'm_tag_src',
'fennec_tag_l10n': 'm_tag_l10n',
'thunderbird_tag_source': 't_tag_src',
'thunderbird_tag_l10n': 't_tag_l10n',
'start_uptake_monitoring': 'ut',--- a/misc.py
+++ b/misc.py
@@ -118,43 +118,16 @@ def shouldBuild(change):
re.compile('^webapprt/win'),
re.compile('^webapprt/mac'),
re.compile('^widget/cocoa'),
re.compile('^widget/windows'),
re.compile('^xulrunner/')
],
- 'b2g': [
- re.compile('^accessible/public/ia2'),
- re.compile('^accessible/public/msaa'),
- re.compile('^accessible/src/mac'),
- re.compile('^accessible/src/windows'),
-
- re.compile('^browser/'),
-
- re.compile('^build/macosx'),
- re.compile('^build/mobile'),
- re.compile('^build/package/mac_osx'),
- re.compile('^build/win32'),
- re.compile('^build/win64'),
-
- re.compile('^devtools/client'),
-
- re.compile('^mobile/'),
-
- re.compile('^webapprt/win'),
- re.compile('^webapprt/mac'),
-
- re.compile('^widget/cocoa'),
- re.compile('^widget/gonk'),
- re.compile('^widget/windows'),
-
- re.compile('^xulrunner/')
- ],
'thunderbird': [
re.compile("^im/"),
re.compile("^suite/")
],
}
def isImportantForProduct(change, product):
@@ -913,17 +886,17 @@ def generateBranchObjects(config, name,
# generate a list of builders, nightly builders (names must be different)
# for easy access
for platform in enabled_platforms:
pf = config['platforms'][platform]
base_name = pf['base_name']
if 'mozharness_config' in pf:
- # this is a spider or b2g build. mozharness desktop builds use same
+ # this is a spider build. mozharness desktop builds use same
# scheduling/naming logic as the non mozharness equivalent.
if pf.get('enable_dep', True):
buildername = '%s_dep' % pf['base_name']
builders.append(buildername)
if pf.get('consider_for_nightly', True):
buildersForNightly.append(buildername)
buildersByProduct.setdefault(
pf['stage_product'], []).append(buildername)
@@ -1251,17 +1224,17 @@ def generateBranchObjects(config, name,
l10nNightlyBuilders, builds_created=builder_tracker)
)
# now crawl outside this condition and see what builders are left
# to do in MBF land
# *NOTE: once we implement everything, we do not need to check below
pass # keep going
elif 'mozharness_config' in pf:
# this is not a desktop mozharness build
- # e.g. it could be b2g or spider)
+ # e.g. it could be spider)
# at the end of this block we 'continue' because we have
# finished all the builders needed for this platform and
# there is nothing left to do
if 'mozharness_repo_url' in pf:
config['mozharness_repo_url'] = pf['mozharness_repo_url']
factory = makeMHFactory(config, pf,
@@ -1384,26 +1357,20 @@ def generateBranchObjects(config, name,
per_checkin_unittest_branch = unittestBranch
if config.get('mozilla_dir'):
extra_args['mozillaDir'] = config['mozilla_dir']
if config.get('mozilla_srcdir'):
extra_args['mozillaSrcDir'] = config['mozilla_srcdir']
multiargs = {}
- if pf.get('product_name') == 'b2g':
- multiargs[
- 'multiLocaleScript'] = 'scripts/b2g_desktop_multilocale.py'
- # b2g builds require mozharness
+ if 'android' in platform:
+ multiargs['multiLocaleScript'] = 'scripts/multil10n.py'
+ # android nightlies require mozharness
multiargs['mozharnessRepoPath'] = config.get('mozharness_repo_path')
- else:
- if 'android' in platform:
- multiargs['multiLocaleScript'] = 'scripts/multil10n.py'
- # android nightlies require mozharness
- multiargs['mozharnessRepoPath'] = config.get('mozharness_repo_path')
if pf.get('multi_config_name'):
multiargs['multiLocaleConfig'] = pf['multi_config_name']
else:
if pf.get('multi_locale_config_platform'):
# normally we look for the mozharness config by platform. But since we have split
# 'android' into two platforms 'android-api-9' and 'android-api-10', this allows us
# to use the already existing '{branch}_android.json' config files for both without
# having to create a dozen new duplicate ones
@@ -1485,32 +1452,22 @@ def generateBranchObjects(config, name,
'signingServers': secrets.get(pf.get('dep_signing_servers')),
'baseMirrorUrls': config.get('base_mirror_urls'),
'baseBundleUrls': config.get('base_bundle_urls'),
'mozillaDir': config.get('mozilla_dir', None),
'mozillaSrcDir': config.get('mozilla_srcdir', None),
'tooltool_manifest_src': pf.get('tooltool_manifest_src'),
'tooltool_script': pf.get('tooltool_script'),
'tooltool_url_list': config.get('tooltool_url_list', []),
- 'gaiaRepo': pf.get('gaia_repo'),
- 'gaiaRevision': config.get('gaia_revision'),
- 'gaiaRevisionFile': pf.get('gaia_revision_file'),
- 'gaiaLanguagesFile': pf.get('gaia_languages_file'),
- 'gaiaLanguagesScript': pf.get('gaia_languages_script', 'scripts/b2g_desktop_multilocale.py'),
- 'gaiaL10nRoot': config.get('gaia_l10n_root'),
'mozharness_repo_cache': mozharness_repo_cache,
'tools_repo_cache': pf.get('tools_repo_cache'),
'mozharnessTag': config.get('mozharness_tag'),
- 'geckoL10nRoot': config.get('gecko_l10n_root'),
- 'geckoLanguagesFile': pf.get('gecko_languages_file'),
'enable_pymake': enable_pymake,
}
factory_kwargs.update(extra_args)
- if pf.get('product_name') == 'b2g':
- factory_kwargs.update(multiargs)
mozilla2_dep_factory = factory_class(**factory_kwargs)
# eg. TB Linux comm-central build
# TB Linux comm-central leak test build
mozilla2_dep_builder = {
'name': '%s build' % pf['base_name'],
'slavenames': pf['slaves'],
'builddir': '%s-%s' % (name, platform),
@@ -1735,26 +1692,17 @@ def generateBranchObjects(config, name,
signingServers=secrets.get(pf.get('nightly_signing_servers')),
baseMirrorUrls=config.get('base_mirror_urls'),
baseBundleUrls=config.get('base_bundle_urls'),
mozillaDir=config.get('mozilla_dir', None),
mozillaSrcDir=config.get('mozilla_srcdir', None),
tooltool_manifest_src=pf.get('tooltool_manifest_src'),
tooltool_script=pf.get('tooltool_script'),
tooltool_url_list=config.get('tooltool_url_list', []),
- gaiaRepo=pf.get('gaia_repo'),
- gaiaRevision=config.get('gaia_revision'),
- gaiaRevisionFile=pf.get('gaia_revision_file'),
- gaiaLanguagesFile=pf.get('gaia_languages_file'),
- gaiaLanguagesScript=pf.get('gaia_languages_script',
- 'scripts/b2g_desktop_multilocale.py'),
- gaiaL10nRoot=config.get('gaia_l10n_root'),
mozharnessTag=config.get('mozharness_tag'),
- geckoL10nRoot=config.get('gecko_l10n_root'),
- geckoLanguagesFile=pf.get('gecko_languages_file'),
enable_pymake=enable_pymake,
mozharness_repo_cache=mozharness_repo_cache,
tools_repo_cache=pf.get('tools_repo_cache'),
**nightly_kwargs
)
# eg. TB Linux comm-aurora nightly
mozilla2_nightly_builder = {--- a/process/factory.py
+++ b/process/factory.py
@@ -837,24 +837,16 @@ class MercurialBuildFactory(MozillaBuild
multiLocaleConfig=None,
mozharnessMultiOptions=None,
tooltool_manifest_src=None,
tooltool_bootstrap="setup.sh",
tooltool_url_list=None,
tooltool_script=None,
enablePackaging=True,
enableInstaller=False,
- gaiaRepo=None,
- gaiaRevision=None,
- gaiaRevisionFile=None,
- gaiaLanguagesFile=None,
- gaiaLanguagesScript=None,
- gaiaL10nRoot=None,
- geckoL10nRoot=None,
- geckoLanguagesFile=None,
relengapi_archiver_repo_path=None,
relengapi_archiver_release_tag=None,
**kwargs):
MozillaBuildFactory.__init__(self, **kwargs)
# Make sure we have a buildid and builduid
self.addStep(FunctionalStep(
name='set_buildids',
@@ -904,30 +896,16 @@ class MercurialBuildFactory(MozillaBuild
self.post_upload_include_platform = post_upload_include_platform
self.useSharedCheckouts = useSharedCheckouts
self.testPrettyNames = testPrettyNames
self.l10nCheckTest = l10nCheckTest
self.tooltool_manifest_src = tooltool_manifest_src
self.tooltool_url_list = tooltool_url_list or []
self.tooltool_script = tooltool_script or ['/tools/tooltool.py']
self.tooltool_bootstrap = tooltool_bootstrap
- self.gaiaRepo = gaiaRepo
- self.gaiaRepoUrl = "https://%s/%s" % (self.hgHost, self.gaiaRepo)
- self.gaiaMirrors = None
- if self.baseMirrorUrls and self.gaiaRepo:
- self.gaiaMirrors = ['%s/%s' % (url, self.gaiaRepo)
- for url in self.baseMirrorUrls]
- self.gaiaRevision = gaiaRevision
- self.gaiaRevisionFile = gaiaRevisionFile
- self.geckoL10nRoot = geckoL10nRoot
- self.geckoLanguagesFile = geckoLanguagesFile
- self.gaiaLanguagesFile = gaiaLanguagesFile
- self.gaiaLanguagesScript = gaiaLanguagesScript
- self.gaiaL10nRoot = gaiaL10nRoot
- self.gaiaL10nBaseDir = WithProperties('%(basedir)s/build-gaia-l10n')
self.compareLocalesRepoPath = compareLocalesRepoPath
self.compareLocalesTag = compareLocalesTag
self.multiLocaleScript = multiLocaleScript
self.multiLocaleConfig = multiLocaleConfig
self.multiLocaleMerge = multiLocaleMerge
self.tools_repo_cache = tools_repo_cache
self.relengapi_archiver_repo_path = relengapi_archiver_repo_path
self.relengapi_archiver_release_tag = relengapi_archiver_release_tag
@@ -1050,21 +1028,16 @@ class MercurialBuildFactory(MozillaBuild
'--add-locales',
'--package-multi',
'--summary', ]
self.addMultiLocaleRepoSteps()
self.multiLocale = multiLocale
- if gaiaLanguagesFile:
- assert gaiaLanguagesScript and gaiaL10nRoot
- self.env['LOCALE_BASEDIR'] = self.gaiaL10nBaseDir
- self.env['LOCALES_FILE'] = self.gaiaLanguagesFile
-
self.addBuildSteps()
if self.uploadSymbols or (not self.disableSymbols and self.packageTests):
self.addBuildSymbolsStep()
if self.uploadSymbols:
self.addUploadSymbolsStep()
if self.enablePackaging or self.uploadPackages:
self.addPackageSteps()
if self.uploadPackages:
@@ -1213,75 +1186,16 @@ class MercurialBuildFactory(MozillaBuild
name='rm_old_pkg',
command="rm -rf %s %s/dist/install/sea/*.exe " %
(' '.join(pkg_patterns), self.mozillaObjdir),
env=self.env,
description=['deleting', 'old', 'package'],
descriptionDone=['delete', 'old', 'package']
))
- def addGaiaSourceSteps(self):
- if self.gaiaRevisionFile:
- def parse_gaia_revision(rc, stdout, stderr):
- properties = {}
- stream = '\n'.join([stdout, stderr])
- # ugh, regex searching json output, since json.loads(stdout)
- # stack dumped on me
- m = re.search('"repo_path": "([^"]+)"', stream, re.M)
- if m:
- properties['gaiaRepoPath'] = m.group(1)
- m = re.search('"revision": "(\w+)"', stream, re.M)
- if m:
- properties['gaiaRevision'] = m.group(1)
- return properties
- self.addStep(SetProperty(
- command=['cat', self.gaiaRevisionFile],
- name="read_gaia_json",
- extract_fn=parse_gaia_revision,
- ))
- self.gaiaRevision = WithProperties("%(gaiaRevision)s")
- self.gaiaRepoUrl = WithProperties("https://" + self.hgHost + "/%(gaiaRepoPath)s")
- if self.baseMirrorUrls:
- self.gaiaMirrors = [WithProperties(url + "/%(gaiaRepoPath)s") for url in self.baseMirrorUrls]
-
- self.addStep(self.makeHgtoolStep(
- name="gaia_sources",
- rev=self.gaiaRevision or 'default',
- repo_url=self.gaiaRepoUrl,
- workdir="build/",
- use_properties=False,
- mirrors=self.gaiaMirrors,
- bundles=[],
- wc='gaia',
- ))
- if self.gaiaLanguagesFile:
- languagesFile = '%(basedir)s/build/gaia/' + \
- self.gaiaLanguagesFile
- cmd = ['python', '%s/%s' % (self.mozharness_path,
- self.gaiaLanguagesScript),
- '--pull',
- '--gaia-languages-file', WithProperties(languagesFile),
- '--gaia-l10n-root', self.gaiaL10nRoot,
- '--gaia-l10n-base-dir', self.gaiaL10nBaseDir,
- '--config-file', self.multiLocaleConfig,
- '--gecko-l10n-root', self.geckoL10nRoot]
- if self.geckoLanguagesFile:
- cmd.extend(
- ['--gecko-languages-file', self.geckoLanguagesFile])
- self.addStep(MockCommand(
- name='clone_gaia_l10n_repos',
- command=cmd,
- env=self.env,
- workdir=WithProperties('%(basedir)s'),
- haltOnFailure=True,
- mock=self.use_mock,
- target=self.mock_target,
- mock_workdir_prefix=None,
- ))
-
def addSourceSteps(self):
if self.useSharedCheckouts:
self.addStep(JSONPropertiesDownload(
name="download_props",
slavedest="buildprops.json",
workdir='.'
))
@@ -1308,18 +1222,16 @@ class MercurialBuildFactory(MozillaBuild
haltOnFailure=True
))
self.addStep(SetProperty(
name='set_got_revision',
command=['hg', 'identify', '-i'],
property='got_revision'
))
- if self.gaiaRepo:
- self.addGaiaSourceSteps()
self.addStep(SetBuildProperty(
name='set_comments',
property_name="comments",
value=lambda build: build.source.changes[-
1].comments if len(
build.source.changes) > 0 else "",
))
@@ -1640,17 +1552,17 @@ class MercurialBuildFactory(MozillaBuild
target=self.mock_target,
mock_workdir_prefix=None,
haltOnFailure=True,
))
# Get package details
self.packageFilename = self.getPackageFilename(self.platform,
self.platform_variation)
- if self.packageFilename and self.productName not in ('b2g',):
+ if self.packageFilename:
self.addFilePropertiesSteps(filename=self.packageFilename,
directory='build/%s/dist' % self.mozillaObjdir,
fileType='package',
haltOnFailure=True)
# Windows special cases
installerFilename = self.getInstallerFilename()
if self.enableInstaller:
self.addStep(ShellCommand(
@@ -1710,40 +1622,30 @@ class MercurialBuildFactory(MozillaBuild
def addUploadSteps(self):
if self.multiLocale:
self.doUpload(postUploadBuildDir='en-US')
cmd = ['python', '%s/%s' % (self.mozharness_path, self.multiLocaleScript),
'--config-file', self.multiLocaleConfig]
if self.multiLocaleMerge:
cmd.append('--merge-locales')
- if self.gaiaLanguagesFile:
- cmd.extend(['--gaia-languages-file', WithProperties(
- '%(basedir)s/build/gaia/' + self.gaiaLanguagesFile)])
- if self.gaiaL10nRoot:
- cmd.extend(['--gaia-l10n-root', self.gaiaL10nRoot])
- if self.geckoLanguagesFile:
- cmd.extend(['--gecko-languages-file', self.geckoLanguagesFile])
- if self.geckoL10nRoot:
- cmd.extend(['--gecko-l10n-root', self.geckoL10nRoot])
cmd.extend(self.mozharnessMultiOptions)
self.addStep(MockCommand(
name='mozharness_multilocale',
command=cmd,
env=self.pkg_env,
workdir=WithProperties('%(basedir)s'),
haltOnFailure=True,
mock=self.use_mock,
target=self.mock_target,
mock_workdir_prefix=None,
))
- # b2g doesn't get snippets, and these steps don't work it, so don't
- # run them. Also ignore the Android release case where
+ # Ignore the Android release case where
# packageFilename is undefined (bug 739959)
- if self.productName != 'b2g' and self.packageFilename:
+ if self.packageFilename:
self.addFilePropertiesSteps(filename=self.packageFilename,
directory='build/%s/dist' % self.mozillaObjdir,
fileType='package',
haltOnFailure=True)
if self.updates_enabled and 'android' not in self.complete_platform:
self.addCreateUpdateSteps()
@@ -1903,18 +1805,16 @@ class TryBuildFactory(MercurialBuildFact
command=['hg', 'up', '-C', '-r', self.buildRevision],
haltOnFailure=True
))
self.addStep(SetProperty(
name='set_got_revision',
command=['hg', 'parent', '--template={node}'],
extract_fn=short_hash
))
- if self.gaiaRepo:
- self.addGaiaSourceSteps()
self.addStep(SetBuildProperty(
name='set_comments',
property_name="comments",
value=lambda build: build.source.changes[-
1].comments if len(
build.source.changes) > 0 else "",
))
--- a/process/release.py
+++ b/process/release.py
@@ -116,18 +116,16 @@ def generateReleaseBranchObjects(release
updateChannels[channel]["partialUpdates"] = partials
branchConfigFile = getRealpath('localconfig.py')
unix_slaves = []
mock_slaves = []
av_slaves = []
all_slaves = []
for p in branchConfig['platforms']:
- if p == 'b2g':
- continue
platform_slaves = branchConfig['platforms'][p].get('slaves', [])
all_slaves.extend(platform_slaves)
if 'linux64-av' in p:
av_slaves.extend(platform_slaves)
elif 'win' not in p:
unix_slaves.extend(platform_slaves)
if branchConfig['platforms'][p].get('use_mock'):
mock_slaves.extend(platform_slaves)--- a/test/test_misc_important.py
+++ b/test/test_misc_important.py
@@ -34,17 +34,17 @@ class TestProductImportance(unittest.Tes
c = Change(revlink="https://hg.mozilla.org/mozilla-central/rev/1234",
files=['browser/foo', 'mobile/bar'])
self.assertTrue(f(c))
def testUnImportant(self):
f = makeImportantFunc(
'https://hg.mozilla.org/mozilla-central', 'firefox')
c = Change(revlink="https://hg.mozilla.org/mozilla-central/rev/1234",
- files=['b2g/foo', 'mobile/bar'])
+ files=['android/foo', 'mobile/bar'])
self.assertFalse(f(c))
def testDontBuild(self):
f = makeImportantFunc(
'https://hg.mozilla.org/mozilla-central', 'firefox')
c = Change(
revlink="https://hg.mozilla.org/mozilla-central/rev/1234",
files=['browser/foo', 'mobile/bar'], comments="DONTBUILD me")--- a/test/test_try_parser.py
+++ b/test/test_try_parser.py
@@ -25,37 +25,29 @@ BUILDER_PRETTY_NAMES = {'macosx64': 'OS
TESTER_PRETTY_NAMES = {'macosx': ['Rev3 MacOSX Leopard 10.5.8'],
'macosx64': ['Rev3 MacOSX Snow Leopard 10.6.2',
'Rev3 MacOSX Leopard 9.0 try-nondefault'],
'win32': ['Rev3 WINNT 5.1',
'Windows XP 32-bit',
'Rev3 WINNT 6.1'],
'linux64': ['Rev3 Fedora 12x64'],
'linux': ['Rev3 Fedora 12'],
- 'linux64_gecko': ['b2g_ubuntu64_vm'],
}
TESTER_PRETTY_TB_NAMES = {'linux': ['TB Rev3 Fedora 12']}
UNITTEST_PRETTY_NAMES = {'win32-debug': 'WINNT 5.2 try debug test'}
-BUILDER_PRETTY_B2G_NAMES = {
- 'emulator': 'b2g_try_emulator build',
- 'emulator-debug': 'b2g_try_emulator-debug build'}
TALOS_SUITES = ['tp4', 'chrome']
UNITTEST_SUITES = ['reftest',
'crashtest',
'mochitest-1',
'mochitest-3',
'mochitest-browser-chrome',
'mochitest-devtools-chrome',
'mochitest-e10s-devtools-chrome-1',
- 'mochitest-other',
- 'gaia-js-integration-1',
- 'gaia-js-integration-2',
- 'gaia-ui-test-accessibility',
- 'gaia-ui-test-unit']
+ 'mochitest-other']
UNITTEST_SUITES_TB = ['xpcshell', 'mozmill']
MOBILE_UNITTEST_SUITES = ['reftest-1', 'reftest-3'] + UNITTEST_SUITES[1:]
VALID_UPN = ['WINNT 5.2 try debug test mochitest-1',
'WINNT 5.2 try debug test mochitest-3',
'WINNT 5.2 try debug test mochitest-browser-chrome',
'WINNT 5.2 try debug test mochitest-e10s-devtools-chrome-1',
'WINNT 5.2 try debug test mochitest-other',
@@ -82,25 +74,19 @@ VALID_TESTER_NAMES = ['Rev3 Fedora 12 tr
'Rev3 WINNT 6.1 try debug test mochitest-other',
'Rev3 WINNT 6.1 try debug test mochitest-3',
'Rev3 MacOSX Snow Leopard 10.6.2 try debug test crashtest',
'Rev3 MacOSX Leopard 9.0 try debug test crashtest',
'Rev3 MacOSX Leopard 9.0 try talos tp4',
'Rev3 WINNT 5.1 try talos chrome',
'Rev3 WINNT 6.1 try talos tp4',
'Rev3 WINNT 5.1 try talos tp4',
- 'Rev3 WINNT 6.1 try talos chrome',
- 'b2g_ubuntu64_vm try opt test gaia-js-integration-1',
- 'b2g_ubuntu64_vm try opt test gaia-js-integration-2',
- 'b2g_ubuntu64_vm try opt test gaia-ui-test-unit',
- 'b2g_ubuntu64_vm try opt test gaia-ui-test-accessibility']
+ 'Rev3 WINNT 6.1 try talos chrome',]
VALID_TESTER_TB_NAMES = ['TB Rev3 Fedora 12 try-comm-central opt test mozmill',
'TB Rev3 Fedora 12 try-comm-central opt test xpcshell']
-VALID_BUILDER_B2G_NAMES = ['b2g_try_emulator-debug build',
- 'b2g_try_emulator build']
def dictslice(d, keys, default=None):
if hasattr(keys, '__call__'):
return dict([(k, v) for k, v in d.items() if keys(k)])
else:
return dict([(k, d.get(k, default)) for k in keys])
@@ -211,34 +197,16 @@ class TestTryParser(unittest.TestCase):
# should specify macosx and macosx64 to get opt and debug
tm = 'try: -b od -p macosx64,macosx'
self.customBuilders = TryParser(
tm, VALID_BUILDER_NAMES, BUILDER_PRETTY_NAMES)
builders = [BUILDER_PRETTY_NAMES[p] for p in ['macosx64',
'macosx64-debug', 'macosx-debug']]
self.assertEquals(sorted(self.customBuilders), sorted(builders))
- def test_B2GPlatform(self):
- tm = 'try: -b od -p emulator'
- self.customBuilders = TryParser(
- tm, VALID_BUILDER_B2G_NAMES, BUILDER_PRETTY_B2G_NAMES)
- builders = self.filterBuilders(
- ['emulator', 'emulator-debug'],
- pretties=BUILDER_PRETTY_B2G_NAMES,
- valid=VALID_BUILDER_B2G_NAMES)
- self.assertEquals(sorted(self.customBuilders), sorted(builders))
- tm = 'try: -b o -p emulator'
- self.customBuilders = TryParser(
- tm, VALID_BUILDER_B2G_NAMES, BUILDER_PRETTY_B2G_NAMES)
- builders = ['b2g_try_emulator build']
- builders = self.filterBuilders(['emulator'],
- pretties=BUILDER_PRETTY_B2G_NAMES,
- valid=VALID_BUILDER_B2G_NAMES)
- self.assertEquals(sorted(self.customBuilders), sorted(builders))
-
def test_FullPlatformsBoth(self):
tm = 'try: -b od -p full'
self.customBuilders = TryParser(
tm, VALID_BUILDER_NAMES, BUILDER_PRETTY_NAMES)
builders = VALID_BUILDER_NAMES
self.assertEqual(sorted(self.customBuilders), sorted(builders))
def test_FullPlatformsOpt(self):
@@ -329,28 +297,16 @@ class TestTryParser(unittest.TestCase):
builders += [t for t in VALID_UPN if 'mochitest-browser-chrome' in t]
self.assertEqual(sorted(self.customBuilders), sorted(builders))
tm = 'try: -b od -p win32 -u mochitest-o'
self.customBuilders = TryParser(tm, VALID_BUILDER_NAMES + VALID_UPN, BUILDER_PRETTY_NAMES, UNITTEST_PRETTY_NAMES, UNITTEST_SUITES)
builders = [BUILDER_PRETTY_NAMES[p] for p in ['win32', 'win32-debug']]
builders += [t for t in VALID_UPN if 'mochitest-other' in t]
self.assertEqual(sorted(self.customBuilders), sorted(builders))
- def test_GijAliasOnTestMaster(self):
- tm = 'try: -b od -p all -u gaia-js-integration'
- self.customBuilders = TryParser(tm, VALID_TESTER_NAMES, TESTER_PRETTY_NAMES, None, UNITTEST_SUITES)
- builders = [t for t in VALID_TESTER_NAMES if 'gaia-js-integration' in t]
- self.assertEqual(sorted(self.customBuilders), sorted(builders))
-
- def test_GipAliasOnTestMaster(self):
- tm = 'try: -b od -p all -u gaia-ui-test'
- self.customBuilders = TryParser(tm, VALID_TESTER_NAMES, TESTER_PRETTY_NAMES, None, UNITTEST_SUITES)
- builders = [t for t in VALID_TESTER_NAMES if 'gaia-ui-test' in t]
- self.assertEqual(sorted(self.customBuilders), sorted(builders))
-
def test_MochitestAliasesOnTestMaster(self):
tm = 'try: -b od -p all -u mochitests'
self.customBuilders = TryParser(tm, VALID_TESTER_NAMES, TESTER_PRETTY_NAMES, None, UNITTEST_SUITES)
builders = [t for t in VALID_TESTER_NAMES if 'mochitest' in t]
self.assertEqual(sorted(self.customBuilders), sorted(builders))
tm = 'try: -b od -p win32 -u mochitest-bc'
self.customBuilders = TryParser(tm, VALID_TESTER_NAMES, TESTER_PRETTY_NAMES, None, UNITTEST_SUITES)
builders = [t for t in self.filterTesters(['win32'])--- a/try_parser.py
+++ b/try_parser.py
@@ -48,20 +48,16 @@ def testSuiteMatches(v, u):
elif u in ('crashtests', 'crashtest'):
return v.startswith('crashtest')
elif u in ('reftests', 'reftest'):
return v.startswith('reftest') or v.startswith('plain-reftest')
elif u in ('web-platform-tests', 'web-platform-test'):
return v.startswith("web-platform-tests")
elif u == 'e10s':
return 'e10s' in v
- elif u == 'gaia-js-integration':
- return 'gaia-js-integration' in v
- elif u == 'gaia-ui-test':
- return 'gaia-ui-test' in v
elif u == 'all':
return True
else:
# validate other test names
return u == v
def expandTestSuites(user_suites, valid_suites):