Backout 7cbe50231e18 (bug 1103825) for xpcshell test failures

toolkit/crashreporter/test/unit_ipc/test_content_annotation.js was
failing with this commit applied. Backing out.
This commit is contained in:
Gregory Szorc 2014-11-25 19:16:57 -08:00
parent ff75043656
commit 0babb98b86
2 changed files with 7 additions and 10 deletions

View File

@ -1,15 +1,14 @@
#
# 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/.
INTERNAL_TOOLS = 1
unit_FILES = $(SHARED_LIBRARY) CrashTestUtils.jsm
unit_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
unit_TARGET := misc
INSTALL_TARGETS += unit
UNIT_FILES = $(SHARED_LIBRARY) CrashTestUtils.jsm
UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
INSTALL_TARGETS += UNIT
unit_ipc_FILES = $(UNIT_FILES)
unit_ipc_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit_ipc/
unit_ipc_TARGET := misc
INSTALL_TARGETS += unit_ipc
UNIT_IPC_FILES = $(UNIT_FILES)
UNIT_IPC_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit_ipc/
INSTALL_TARGETS += UNIT_IPC

View File

@ -3,8 +3,6 @@
# 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/.
HAS_MISC_RULE = True
NO_DIST_INSTALL = True
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']