bug 807125 - roll out b2g emulator xpcshell. r=bhearsum
authorAki Sasaki <asasaki@mozilla.com>
Wed, 12 Dec 2012 09:52:08 -0800
changeset 7476 f0131ca17b4197ba221c0d0a1cb0404c80cc436e
parent 7473 7a3838f09e42fb9b672ba61ed7bb70d53a70083a
child 7477 f59ae4af51974604cfc23710e9743d8d1ae99676
push id5770
push userasasaki@mozilla.com
push dateWed, 12 Dec 2012 17:52:10 +0000
reviewersbhearsum
bugs807125
bug 807125 - roll out b2g emulator xpcshell. r=bhearsum
mozilla-tests/b2g_config.py
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -147,17 +147,17 @@ REFTEST_ONLY = [
 XPCSHELL_ONLY = [
     ('xpcshell', {'suite': 'xpcshell',
                    'mozharness_repo': MOZHARNESS_REPO,
                    'script_path': 'scripts/b2g_emulator_unittest.py',
                   },
     ),
 ]
 
-ALL_UNITTESTS = MOCHITEST_ONLY + REFTEST_ONLY + [
+ALL_UNITTESTS = MOCHITEST_ONLY + REFTEST_ONLY + XPCSHELL_ONLY + [
     ('marionette-webapi', {'suite': 'marionette-webapi',
                            'mozharness_repo': MOZHARNESS_REPO,
                            'script_path': 'scripts/marionette.py',
                           },
     ),
 ]
 
 # Default set of unit tests
@@ -375,17 +375,16 @@ for branch in BRANCHES.keys():
     BRANCHES[branch]['pgo_platforms'] = []
 
 # The following are exceptions to the defaults
 
 BRANCHES['ash']['branch_name'] = "Ash"
 BRANCHES['ash']['repo_path'] = "projects/ash"
 BRANCHES['cedar']['branch_name'] = "Cedar"
 BRANCHES['cedar']['repo_path'] = "projects/cedar"
-BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['fedora-b2g']['opt_unittest_suites'] += XPCSHELL_ONLY
 BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['fedora-b2g']['suite_config']['reftest-1'] = {
     'extra_args': [
         '--cfg', 'b2g/emulator_automation_config.py',
         '--test-suite', 'reftest',
         '--test-manifest', 'tests/layout/reftests/reftest.list',
         '--this-chunk', '1', '--total-chunks', '6',
     ],
 }