Back out changeset 76411e442ff3 (bug 1262866) for causing the crashreporter browser-chrome tests to run on, and thus fail on, the --disable-crashreporter ASan builds
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 11 Apr 2016 20:34:05 -0700
changeset 316498 6cd73ef4a652798423cf0c95a621b16d986cda83
parent 316497 9ff4ef78ee4fccb7129a14b0853d58fc690522b1
child 316499 a68f4eb45a851e94f19fab3a780f3e329d2b2aa8
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1262866
milestone48.0a1
backs out76411e442ff3c9e758edba9bad6bea9ef6d0ab06
Back out changeset 76411e442ff3 (bug 1262866) for causing the crashreporter browser-chrome tests to run on, and thus fail on, the --disable-crashreporter ASan builds
toolkit/crashreporter/test/moz.build
toolkit/moz.build
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -1,16 +1,17 @@
 # -*- 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,22 +43,16 @@ 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')