Bug 1043699 - Add Mulet reftests to Ash. r=jlund
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Thu, 25 Sep 2014 09:37:05 -0400
changeset 11089 93e40fcc9464
parent 11087 0cd5639ac300
child 11090 8d46a609ae7e
push id8137
push userarmenzg@mozilla.com
push dateThu, 25 Sep 2014 13:37:42 +0000
reviewersjlund
bugs1043699
Bug 1043699 - Add Mulet reftests to Ash. r=jlund
mozilla-tests/b2g_config.py
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -303,16 +303,25 @@ MOCHITEST_MULET_PLAIN = [
     ('mochitest-5', {'suite': 'mochitest-plain',
                                  'use_mozharness': True,
                                  'script_path': 'scripts/desktop_unittest.py',
                                  'blob_upload': True,
                                 }
     ),
 ]
 
+REFTEST_MULET = [
+    ('reftest', {
+        'suite': 'reftest',
+        'use_mozharness': True,
+        'script_path': 'scripts/mulet_unittest.py',
+        'blob_upload': True,
+    }),
+]
+
 MOCHITEST_EMULATOR_DEBUG = [
     ('mochitest-debug-1', {'suite': 'mochitest-plain',
                            'use_mozharness': True,
                            'script_path': 'scripts/b2g_emulator_unittest.py',
                            'blob_upload': True,
                            },
      ),
     ('mochitest-debug-2', {'suite': 'mochitest-plain',
@@ -892,16 +901,24 @@ PLATFORM_UNITTEST_VARS = {
                 },
                 'mochitest-5': {
                     'extra_args': [
                       '--cfg', 'unittests/linux_unittest.py',
                       '--total-chunks', 5, '--this-chunk', 5,
                       '--mochitest-suite', 'plain-chunked',
                     ]
                 },
+                'reftest': {
+                    'extra_args': [
+                      '--cfg', 'b2g/generic_config.py',
+                      '--cfg', 'b2g/mulet_config.py',
+                      '--test-suite', 'reftest',
+                      '--test-manifest', 'tests/layout/reftests/reftest.list',
+                    ]
+                },
             },
         },
     },
     'macosx64-mulet': {
         'product_name': 'b2g',
         'app_name': 'firefox',
         'brand_name': 'Mulet',
         'builds_before_reboot': 1,
@@ -2194,16 +2211,18 @@ def exclude_suites(slave_platform, branc
             slave_p['debug_unittest_suites'] = [x for x in slave_p['debug_unittest_suites']
                                             if x[0] if x[0] not in suites_to_be_excluded]
 
 exclude_suites(('linux64_gecko', 'ubuntu64_vm-b2gdt'), 'cedar', ('gaia-ui-test',), True, True)
 exclude_suites(('linux32_gecko', 'ubuntu32_vm-b2gdt'), 'cedar', ('gaia-ui-test',), True, True)
 exclude_suites(('macosx64_gecko', 'mountainlion-b2gdt'), 'cedar', ('gaia-ui-test',), True, True)
 exclude_suites(('emulator', 'ubuntu64_vm-b2g-lg-emulator'), 'cedar', ('gaia-ui-test',), True, True)
 
+# Enable mulet reftests on Ash
+BRANCHES['ash']['platforms']['linux64-mulet']['ubuntu64_vm-mulet']['opt_unittest_suites'] += REFTEST_MULET
 
 # new linux64_gecko tests as of gecko 32
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 32):
     BRANCHES[name]['platforms']['linux64_gecko']['ubuntu64_vm-b2gdt']['opt_unittest_suites'] += \
       GAIA_BUILD + REFTEST_DESKTOP_OOP_SANITY + MOCHITEST_OOP_DESKTOP
 
 # new linux64_gecko tests as of gecko 34
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 34):