Bug 971687 - Please schedule mozbase unit tests on Cedar; r=bhearsum
☠☠ backed out by 6b2178bf1706 ☠ ☠
authorDan Minor <dminor@mozilla.com>
Thu, 13 Feb 2014 08:22:51 -0500
changeset 9844 571a4edc512778628e8c9bda6687c721684f742f
parent 9843 39a0203c51d5c19b4283ece00d9a2556b1f95d94
child 9845 6b2178bf17063de905378f87154968ebefd93143
push id7308
push userdminor@mozilla.com
push dateThu, 13 Feb 2014 13:25:01 +0000
reviewersbhearsum
bugs971687
Bug 971687 - Please schedule mozbase unit tests on Cedar; r=bhearsum
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -528,16 +528,24 @@ METRO = [
 JITTEST = [
     ('jittest', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--jittest-suite', 'jittest'],
         'script_maxtime': 7200,
     }),
 ]
+MOZBASE = [
+    ('mozbase', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mozbase-suite', 'mozbase'],
+        'script_maxtime': 7200,
+    }),
+]
 
 WEB_PLATFORM_TESTS = [
     ('web-platform-tests', {
         'use_mozharness': True,
         'script_path': 'scripts/web_platform_tests.py',
         'extra_args': [],
         'blob_upload': True,
         'script_maxtime': 7200,
@@ -1768,16 +1776,28 @@ for platform in PLATFORMS.keys():
 
         BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += WEB_PLATFORM_TESTS
 
 # Let's add the metro unit tests for Windows 8
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 28):
     if 'win32' in branch['platforms'] and 'win8' in branch['platforms']['win32']:
         branch['platforms']['win32']['win8']['opt_unittest_suites'] += METRO[:]
 
+# Enable mozbase unit tests on cedar
+# https://bugzilla.mozilla.org/show_bug.cgi?id=971687
+for platform in PLATFORMS.keys():
+    if platform not in (BRANCHES['cedar']['platforms']:
+        continue
+    for slave_platform in PLATFORMS[platform]['slave_platforms']:
+        if 'fedora' in slave_platform:
+            continue  # Don't use rev3 mini's with this stuff
+        if slave_platform in BRANCHES['cedar']['platforms'][platform]:
+            BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOZBASE[:]
+            BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOZBASE[:]
+
 NON_UBUNTU_BRANCHES = set([name for name, branch in items_before(BRANCHES, 'gecko_version', 21)])
 
 
 # Green tests, including mozharness based ones
 # Tests listed as Ubuntu tests won't be enabled on Fedora
 def get_ubuntu_unittests(branch, test_type):
     UBUNTU_TESTS = {"opt_unittest_suites":
                     ["crashtest", "jsreftest", "jetpack", "crashtest-ipc",