Bug 1262866 - Include toolkit/crashreporter/test/browser/browser.ini in a more central moz.build to avoid a failure when running tests against --disable-crashreporter builds. r=mshal

MozReview-Commit-ID: 9DzmJjzpZe7
This commit is contained in:
Chris Manchester 2016-04-11 11:21:20 -07:00
parent ac5be5fb45
commit dc426e9cbb
2 changed files with 6 additions and 1 deletions

View File

@ -6,7 +6,6 @@
FINAL_TARGET = '_tests/xpcshell/toolkit/crashreporter/test'
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
UNIFIED_SOURCES += [
'../google-breakpad/src/processor/basic_code_modules.cc',

View File

@ -48,6 +48,12 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
DIRS += ['system/androidproxy']
# Tests in other directories rely on files in this browser test
# manifest. Include it here instead of crashreporter/test/moz.build
# to avoid a failure when testing --disable-crashreporter builds.
BROWSER_CHROME_MANIFESTS += ['crashreporter/test/browser/browser.ini']
if CONFIG['MOZ_CRASHREPORTER']:
DIRS += ['crashreporter']