Bug 1201891 - remove Android 4.0 debug mochitests from running on try r=Callek
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -2425,26 +2425,16 @@ for name, branch in items_at_least(BRANC
'opt_unittest_suites': deepcopy(ANDROID_2_3_C3_DICT['opt_unittest_suites']),
'debug_unittest_suites': []
}
BRANCHES[name]['platforms'][platform]['ubuntu64_vm_mobile'] = {
'opt_unittest_suites': deepcopy(ANDROID_2_3_AWS_DICT['opt_unittest_suites']),
'debug_unittest_suites': []
}
-#bug 1133833 enable Android 4.3 to run on try
-BRANCHES['try']['platforms']['android-api-11']['ubuntu64_vm_armv7_large'] = {
- 'opt_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['opt_unittest_suites']),
- 'debug_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['debug_unittest_suites']),
-}
-BRANCHES['try']['platforms']['android-api-11']['ubuntu64_vm_armv7_mobile'] = {
- 'opt_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['opt_unittest_suites']),
- 'debug_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['debug_unittest_suites']),
-}
-
# bug 1133833 enable Android 4.3 on trunk for opt only
# while disabling corresponding 4.0 tests
for name, branch in items_at_least(BRANCHES, 'gecko_version', 40):
# Loop removes it from any branch that gets beyond here
if name in ('try', ):
continue
for platform in branch['platforms']:
if not platform in PLATFORMS:
@@ -2502,17 +2492,17 @@ for name, branch in items_at_least(BRANC
if not slave_plat in branch['platforms'][platform]:
continue
if not 'panda' in slave_plat:
continue
if branch['platforms'][platform]['enable_debug_unittests'] is True:
BRANCHES[name]['platforms'][platform][slave_plat]['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_PLAIN_REFTEST + ANDROID_MOZHARNESS_XPCSHELL)
for name, branch in items_at_least(BRANCHES, 'gecko_version', 41):
- if name in ('try', 'cedar' ):
+ if name in ('cedar' ):
continue
for platform in branch['platforms']:
if not platform in PLATFORMS:
continue
if platform not in ('android-api-11'):
continue
for slave_plat in PLATFORMS[platform]['slave_platforms']:
if not slave_plat in branch['platforms'][platform]:
@@ -2523,16 +2513,26 @@ for name, branch in items_at_least(BRANC
'opt_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['opt_unittest_suites']),
'debug_unittest_suites': deepcopy(ANDROID_4_3_C3_TRUNK_DICT['debug_unittest_suites']),}
BRANCHES[name]['platforms']['android-api-11']['ubuntu64_vm_armv7_mobile'] = {
'opt_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['opt_unittest_suites']),
'debug_unittest_suites': deepcopy(ANDROID_4_3_AWS_TRUNK_DICT['debug_unittest_suites']),
}
BRANCHES[name]['platforms']['android-api-11']['panda_android']['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_PLAIN_REFTEST)
+#bug 1133833 enable Android 4.3 to run on try
+BRANCHES['try']['platforms']['android-api-11']['ubuntu64_vm_armv7_large'] = {
+ 'opt_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['opt_unittest_suites']),
+ 'debug_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['debug_unittest_suites']),
+}
+BRANCHES['try']['platforms']['android-api-11']['ubuntu64_vm_armv7_mobile'] = {
+ 'opt_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['opt_unittest_suites']),
+ 'debug_unittest_suites': deepcopy(ANDROID_4_3_AWS_DICT['debug_unittest_suites']),
+}
+
def remove_suite_from_slave_platform(BRANCHES, PLATFORMS, suite_to_remove, slave_platform, branches_to_keep=[]):
"""Remove suites named like |suite_to_remove| from all branches on slave platforms named like |slave_platform|.
Updates BRANCHES in place. Consumes PLATFORMS without side
effects. Does not remove any suites from the specified
|branches_to_keep|."""
tuples_to_delete = []