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
☠☠ backed out by 6cd73ef4a652 ☠ ☠
authorChris Manchester <cmanchester@mozilla.com>
Mon, 11 Apr 2016 11:21:20 -0700
changeset 332510 76411e442ff3c9e758edba9bad6bea9ef6d0ab06
parent 332509 bfc1e070806f5326ac442674f1268aed7576d92a
child 332511 68779538bf0028b89d5d4268c5619ca15037e92f
push id1146
push userCallek@gmail.com
push dateMon, 25 Jul 2016 16:35:44 +0000
treeherdermozilla-release@a55778f9cd5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1262866
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
toolkit/crashreporter/test/moz.build
toolkit/moz.build
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -1,17 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 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',
     '../google-breakpad/src/processor/dump_context.cc',
     '../google-breakpad/src/processor/dump_object.cc',
     '../google-breakpad/src/processor/logging.cc',
     '../google-breakpad/src/processor/minidump.cc',
     '../google-breakpad/src/processor/pathname_stripper.cc',
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -43,16 +43,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
     DIRS += ['system/unixproxy']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['system/osxproxy']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['system/windowsproxy']
 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']
 
 with Files('mozapps/installer/windows/*'):
     BUG_COMPONENT = ('Toolkit', 'NSIS Installer')
 
 with Files('pluginproblem/*'):
     BUG_COMPONENT = ('Core', 'Plug-ins')