Bug 575918: Temporarily disable OOP xpcshell on OS X because it's completely broken. r=bsmedberg
authorChris Jones <jones.chris.g@gmail.com>
Wed, 30 Jun 2010 17:53:51 -0500
changeset 46948 4aebd52d74e85d3059a5e0e9b8b43715e57491d3
parent 46947 ff63836f5fca48374b0c4394845bf17d3846884c
child 46950 6c56e72204d4cd33bea3f16ee1738aa8463d6a30
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs575918
milestone2.0b2pre
Bug 575918: Temporarily disable OOP xpcshell on OS X because it's completely broken. r=bsmedberg
chrome/test/Makefile.in
ipc/testshell/Makefile.in
js/ipc/tests/Makefile.in
netwerk/cookie/Makefile.in
netwerk/test/Makefile.in
--- a/chrome/test/Makefile.in
+++ b/chrome/test/Makefile.in
@@ -42,12 +42,15 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_chrome
 
 XPCSHELL_TESTS = unit \
                  $(NULL)
 ifdef MOZ_IPC
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS += unit_ipc
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -62,13 +62,16 @@ CPPSRCS += \
   $(NULL)
 
 # For xpcshell error messages and nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/js/src/xpconnect/shell \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS = tests
+endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/js/ipc/tests/Makefile.in
+++ b/js/ipc/tests/Makefile.in
@@ -39,12 +39,15 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_jsipc
 
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS = unit
+endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -79,18 +79,21 @@ EXPORTS_mozilla/net = \
 		CookieServiceChild.h  \
 		$(NULL)
 
 CPPSRCS += \
 		CookieServiceParent.cpp \
 		CookieServiceChild.cpp \
 		$(NULL)
 
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS += test/unit_ipc
 endif
 endif
+endif
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -91,18 +91,21 @@ LIBS		= $(EXTRA_DSO_LIBS) \
 		  $(XPCOM_LIBS) \
 		  $(NSPR_LIBS) \
 		  $(NULL)
 
 DEFINES += $(TK_CFLAGS)
 
 XPCSHELL_TESTS = unit
 ifdef MOZ_IPC
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS += unit_ipc
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
 
 check::
 	$(RUN_TEST_PROGRAM) $(DIST)/bin/TestCookie$(BIN_SUFFIX)
 
 _RES_FILES 	= urlparse.dat \
 		  urlparse_unx.dat \