Bug 985902 - expose fxaccounts/MOZ_SERVICES_FXACCOUNTS to mozinfo and only run test_hawkclient when enabled. r=ted,a=test-only
authorMark Hammond <mhammond@skippinet.com.au>
Mon, 31 Mar 2014 14:15:05 +1100
changeset 192719 e6e2ddd5b100f10548526a19fb75c5e4c6c0004c
parent 192718 cfee1adfcd258bb138f3d1ed5d1e88d5a61023e1
child 192720 0575c15f71fc62fc145655632c03a52ede3aaf03
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, test-only
bugs985902
milestone30.0a2
Bug 985902 - expose fxaccounts/MOZ_SERVICES_FXACCOUNTS to mozinfo and only run test_hawkclient when enabled. r=ted,a=test-only
python/mozbuild/mozbuild/mozinfo.py
services/common/tests/unit/xpcshell.ini
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -73,16 +73,17 @@ def build_dict(config, env=os.environ):
     # hardcoded list of known 32-bit CPUs
     elif p in ["x86", "arm", "ppc"]:
         d["bits"] = 32
     # other CPUs will wind up with unknown bits
 
     d['debug'] = substs.get('MOZ_DEBUG') == '1'
     d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER'))
     d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING'))
+    d['fxaccounts'] = substs.get('MOZ_SERVICES_FXACCOUNTS') == '1'
     d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1'
     d['asan'] = substs.get('MOZ_ASAN') == '1'
     d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
     d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
 
     d['webm'] = bool(substs.get('MOZ_WEBM'))
     d['wave'] = bool(substs.get('MOZ_WAVE'))
 
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -22,16 +22,17 @@ firefox-appdir = browser
 [test_utils_utf8.js]
 [test_utils_uuid.js]
 
 [test_async_chain.js]
 [test_async_querySpinningly.js]
 [test_bagheera_server.js]
 [test_bagheera_client.js]
 [test_hawkclient.js]
+run-if = fxaccounts # This test imports some FxAccounts modules.
 [test_hawkrequest.js]
 [test_observers.js]
 [test_restrequest.js]
 [test_tokenauthenticatedrequest.js]
 
 # Storage service APIs
 [test_storageservice_bso.js]
 [test_storageservice_client.js]