Attachment 8602293 Details for Bug 1160183

[patch] bug1160183.patch

bug1160183.patch (text/plain), 4.96 KB, created by Kim Moir [:kmoir] ET

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir [:kmoir] ET

Size: 4.96 KB

patch

obsolete

>diff --git a/mozilla-tests/mobile_config.py b/mozilla-tests/mobile_config.py
>--- a/mozilla-tests/mobile_config.py
>+++ b/mozilla-tests/mobile_config.py
>@@ -2352,26 +2352,34 @@ for suite in ANDROID_2_3_MOZHARNESS_DICT
>         ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
>     elif suite[0].startswith('crashtest'):
>         ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
>     elif suite[0].startswith('jsreftest'):
>         ANDROID_2_3_C3_DICT['opt_unittest_suites'].append(suite)
>     else:
>         ANDROID_2_3_AWS_DICT['opt_unittest_suites'].append(suite)
> 
>-#split 4.3 tests to ones that can run on C3 vs less powerful instances
>-for suite in ANDROID_4_3_MOZHARNESS_DICT:
>+
>+#split 4.3 opt and debug tests to ones that can run on C3 vs less powerful instances
>+for suite in ANDROID_4_3_MOZHARNESS_DICT: 
>     if suite[0].startswith('plain-reftest'):
>         ANDROID_4_3_C3_DICT['opt_unittest_suites'].append(suite)
>+        ANDROID_4_3_C3_DICT['debug_unittest_suites'].append(suite)
>+    elif suite[0].startswith('mochitest') and not suite[0].startswith('mochitest-gl'):    
>+        ANDROID_4_3_AWS_DICT['opt_unittest_suites'].append(suite)      
>+        ANDROID_4_3_C3_DICT['debug_unittest_suites'].append(suite)
>     elif suite[0].startswith('crashtest'):
>         ANDROID_4_3_C3_DICT['opt_unittest_suites'].append(suite)
>+        ANDROID_4_3_C3_DICT['debug_unittest_suites'].append(suite)
>     elif suite[0].startswith('jsreftest'):
>         ANDROID_4_3_C3_DICT['opt_unittest_suites'].append(suite)
>+        ANDROID_4_3_C3_DICT['debug_unittest_suites'].append(suite)
>     else:
>         ANDROID_4_3_AWS_DICT['opt_unittest_suites'].append(suite)      
>+        ANDROID_4_3_AWS_DICT['debug_unittest_suites'].append(suite)      
> 
> # bug 1073772 - enable new apk split builders will ride the trains
> for name, branch in items_at_least(BRANCHES, 'gecko_version', 37):
>     # remove the soon to be replaced android builds
>     if 'android' in branch['platforms']:
>         del branch['platforms']['android']
>     if 'android-debug' in branch['platforms']:
>         del branch['platforms']['android-debug']
>@@ -2402,21 +2410,21 @@ for name, branch in items_at_least(BRANC
> for platform_name in ('android', 'android-api-11'):
>     if platform_name in BRANCHES['cedar']['platforms']:
>         BRANCHES['cedar']['platforms'][platform_name]['enable_debug_unittests'] = True
>         BRANCHES['cedar']['platforms'][platform_name]['panda_android']['debug_unittest_suites'] = deepcopy(ANDROID_MOZHARNESS_MOCHITEST + ANDROID_MOZHARNESS_PLAIN_ROBOCOP + ANDROID_MOZHARNESS_JSREFTEST + ANDROID_MOZHARNESS_CRASHTEST + ANDROID_MOZHARNESS_MOCHITESTGL + ANDROID_MOZHARNESS_PLAIN_REFTEST + ANDROID_MOZHARNESS_XPCSHELL + ANDROID_MOZHARNESS_JITTEST + ANDROID_MOZHARNESS_CPPUNITTEST)
> 
> #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['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['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
>@@ -2431,19 +2439,16 @@ for name, branch in items_at_least(BRANC
>             if not 'panda' in slave_plat:
>                 continue
>             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': [],}
>             BRANCHES[name]['platforms']['android-api-11']['ubuntu64_vm_armv7_large'] = {
>             'opt_unittest_suites': deepcopy(ANDROID_4_3_C3_DICT['opt_unittest_suites']),
>             '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['opt_unittest_suites']),}
>             BRANCHES[name]['platforms']['android-api-11']['panda_android']['opt_unittest_suites'] = []
> 
> # bug 1030753 limit the debug tests run on trunk branches
> for name, branch in items_at_least(BRANCHES, 'gecko_version', 34):
>     # Loop removes it from any branch that gets beyond here
>     if name in ('cedar', ):
>         continue
>     for platform in branch['platforms']:

Flags:

rail: review+
kmoir: checked-in+

Actions: View | Diff | Review

Attachments on bug 1160183: 8601098 | 8601492 | 8602293 | 8602294 | 8602718