Bug 585734 Disable some c++ unit tests (TestCSSPropertyLookup, TestWinDND) in static builds due to compilation failures. r=khuey,a=test-only fix

This commit is contained in:
Mark Banner 2010-08-10 10:44:25 +01:00
parent 911cb73155
commit 56fc2d488f
2 changed files with 4 additions and 0 deletions

View File

@ -71,10 +71,12 @@ HOST_SIMPLE_PROGRAMS = $(addprefix host_, $(HOST_CPPSRCS:.cpp=$(HOST_BIN_SUFFIX)
# 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

View File

@ -42,6 +42,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef BUILD_STATIC_LIBS
ifndef MOZ_ENABLE_LIBXUL
LOCAL_INCLUDES = -I$(srcdir)/../ \
-I$(srcdir)/../../xpwidgets \
@ -63,5 +64,6 @@ OS_LIBS += $(call EXPAND_LIBNAME,ole32 oleaut32 shell32 comctl32 comdlg32 imm32
CPP_UNIT_TESTS = TestWinDND.cpp \
$(NULL)
endif
endif
include $(topsrcdir)/config/rules.mk