Merging in changeset 4aebd52d74e8.

This commit is contained in:
Johnny Stenback 2010-06-30 17:06:01 -07:00
commit 13f97abecf
5 changed files with 15 additions and 0 deletions

View File

@ -47,7 +47,10 @@ MODULE = test_chrome
XPCSHELL_TESTS = unit \ XPCSHELL_TESTS = unit \
$(NULL) $(NULL)
ifdef MOZ_IPC ifdef MOZ_IPC
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
ifneq ($(OS_ARCH),Darwin)
XPCSHELL_TESTS += unit_ipc XPCSHELL_TESTS += unit_ipc
endif endif
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -67,7 +67,10 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/base \
$(NULL) $(NULL)
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
ifneq ($(OS_ARCH),Darwin)
XPCSHELL_TESTS = tests XPCSHELL_TESTS = tests
endif
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk

View File

@ -44,7 +44,10 @@ include $(DEPTH)/config/autoconf.mk
MODULE = test_jsipc MODULE = test_jsipc
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
ifneq ($(OS_ARCH),Darwin)
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
endif
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -84,9 +84,12 @@ CPPSRCS += \
CookieServiceChild.cpp \ CookieServiceChild.cpp \
$(NULL) $(NULL)
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
ifneq ($(OS_ARCH),Darwin)
XPCSHELL_TESTS += test/unit_ipc XPCSHELL_TESTS += test/unit_ipc
endif endif
endif endif
endif
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk

View File

@ -96,8 +96,11 @@ DEFINES += $(TK_CFLAGS)
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
ifdef MOZ_IPC ifdef MOZ_IPC
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
ifneq ($(OS_ARCH),Darwin)
XPCSHELL_TESTS += unit_ipc XPCSHELL_TESTS += unit_ipc
endif endif
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk