merge fx-team to mozilla-central

This commit is contained in:
Carsten "Tomcat" Book 2014-03-31 12:43:28 +02:00
commit 9df69f87c9
2 changed files with 2 additions and 0 deletions

View File

@ -78,6 +78,7 @@ def build_dict(config, env=os.environ):
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"

View File

@ -27,6 +27,7 @@ firefox-appdir = browser
[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]