Bug 585734 Disable some c++ unit tests (TestCSSPropertyLookup, TestWinDND) in static builds due to compilation failures. r=khuey,a=test-only fix
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 10 Aug 2010 10:44:25 +0100
changeset 49261 0de04ae0386f5c74d5750cb3cf882db2c6ae24f6
parent 49260 827919491123f5f229ce4c62ed02e8cb8038df70
child 49262 3be636b90c55eda5fa3f8d747f1e5d797d5c95a6
push id14965
push userbugzilla@standard8.plus.com
push dateTue, 10 Aug 2010 09:52:25 +0000
treeherdermozilla-central@905529619219 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, test-only
bugs585734
milestone2.0b4pre
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 585734 Disable some c++ unit tests (TestCSSPropertyLookup, TestWinDND) in static builds due to compilation failures. r=khuey,a=test-only fix
layout/style/test/Makefile.in
widget/src/windows/tests/Makefile.in
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -66,20 +66,22 @@ HOST_SIMPLE_PROGRAMS	= $(addprefix host_
 # ParseCSS.cpp used to be built as a test program, but it was not
 # being used for anything, and recent changes to the CSS loader have
 # made it fail to link.  Further changes are planned which should make
 # it buildable again.
 #
 # TestCSSPropertyLookup.cpp needs the internal XPCOM APIs and so cannot
 # be built with libxul enabled.
 
+ifndef BUILD_STATIC_LIBS
 ifndef MOZ_ENABLE_LIBXUL
 CPP_UNIT_TESTS = TestCSSPropertyLookup.cpp
 LIBS += ../nsCSSKeywords.$(OBJ_SUFFIX) ../nsCSSProps.$(OBJ_SUFFIX) $(XPCOM_LIBS)
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZILLA_INTERNAL_API -D_IMPL_NS_LAYOUT
 
 # FIXME: We don't seem to do auto-generated dependencies here.
 host_ListCSSProperties.$(OBJ_SUFFIX): $(srcdir)/../nsCSSPropList.h
 TestCSSPropertyLookup.$(OBJ_SUFFIX): $(srcdir)/../nsCSSProps.h $(srcdir)/../nsCSSKeywords.h
--- a/widget/src/windows/tests/Makefile.in
+++ b/widget/src/windows/tests/Makefile.in
@@ -37,16 +37,17 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifndef BUILD_STATIC_LIBS
 ifndef MOZ_ENABLE_LIBXUL
 LOCAL_INCLUDES =  -I$(srcdir)/../   \
                   -I$(srcdir)/../../xpwidgets \
                   $(NULL)
 
 LIBS = ../$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
        ../../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
        $(DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX) \
@@ -58,10 +59,11 @@ LIBS = ../$(LIB_PREFIX)widget_windows.$(
 
 EXTRA_DSO_LDOPTS += $(LIBS_DIR)
 
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 oleaut32 shell32 comctl32 comdlg32 imm32 shlwapi winspool)
 
 CPP_UNIT_TESTS = TestWinDND.cpp \
                  $(NULL)
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk