Bug 883339 - Enable Gtests on Windows. r=jmathies

--HG--
extra : rebase_source : 7fa5b4c1cc6816752d2f34cf449c7b2ce82055bc
This commit is contained in:
Benoit Girard 2014-02-11 21:57:24 -05:00
parent 3ea16e5ebd
commit 2e023d551b

View File

@ -15,11 +15,6 @@ LOCAL_INCLUDES += \
include $(topsrcdir)/config/rules.mk
ifeq (browser,$(MOZ_BUILD_APP))
# Disable because of metro linking error bug 883339:
# LNK1181: cannot open input file 'runtimeobject.lib'
# And non metro linking error bug 886656:
# LNK1112: module machine type 'x64' conflicts with target machine type 'X86'
ifneq ($(OS_ARCH),WINNT)
ifdef COMPILE_ENVIRONMENT
check gtest::
$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
@ -29,4 +24,3 @@ endif
$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
endif
endif
endif