Bug 1205687 - Package and include Marionette tests in all-tests.json; r=chmanchester,gps

Listing the tests in all-tests.json is prerequisite to adding support
for Marionette tests to `./mach test FILE`.

Marionette tests will be run from the source directory, as they do not
currently need packaging.
This commit is contained in:
Andreas Tolfsen 2015-10-22 16:22:34 +01:00
parent 8c4c1543a7
commit 77aab8842c
3 changed files with 29 additions and 1 deletions

View File

@ -1445,6 +1445,26 @@ VARIABLES = {
"""List of manifest files defining Android instrumentation tests.
"""),
'MARIONETTE_LAYOUT_MANIFESTS': (StrictOrderingOnAppendList, list,
"""List of manifest files defining marionette-layout tests.
"""),
'MARIONETTE_LOOP_MANIFESTS': (StrictOrderingOnAppendList, list,
"""List of manifest files defining marionette-loop tests.
"""),
'MARIONETTE_UNIT_MANIFESTS': (StrictOrderingOnAppendList, list,
"""List of manifest files defining marionette-unit tests.
"""),
'MARIONETTE_UPDATE_MANIFESTS': (StrictOrderingOnAppendList, list,
"""List of manifest files defining marionette-update tests.
"""),
'MARIONETTE_WEBAPI_MANIFESTS': (StrictOrderingOnAppendList, list,
"""List of manifest files defining marionette-webapi tests.
"""),
'METRO_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list,
"""List of manifest files defining metro browser chrome tests.
"""),

View File

@ -1034,7 +1034,6 @@ class TreeMetadataEmitter(LoggingMixin):
else 'USE_LIBS'))
def _process_test_manifests(self, context):
for prefix, info in TEST_MANIFESTS.items():
for path in context.get('%s_MANIFESTS' % prefix, []):
for obj in self._process_test_manifest(context, info, path):

View File

@ -260,6 +260,15 @@ TEST_MANIFESTS = dict(
ANDROID_INSTRUMENTATION=('instrumentation', 'instrumentation', '.', False),
JETPACK_PACKAGE=('jetpack-package', 'testing/mochitest', 'jetpack-package', True),
JETPACK_ADDON=('jetpack-addon', 'testing/mochitest', 'jetpack-addon', False),
# marionette tests are run from the srcdir
# TODO(ato): make packaging work as for other test suites
MARIONETTE=('marionette', 'marionette', '.', False),
MARIONETTE_LOOP=('marionette', 'marionette', '.', False),
MARIONETTE_UNIT=('marionette', 'marionette', '.', False),
MARIONETTE_UPDATE=('marionette', 'marionette', '.', False),
MARIONETTE_WEBAPI=('marionette', 'marionette', '.', False),
METRO_CHROME=('metro-chrome', 'testing/mochitest', 'metro', True),
MOCHITEST=('mochitest', 'testing/mochitest', 'tests', True),
MOCHITEST_CHROME=('chrome', 'testing/mochitest', 'chrome', True),