Bug 886656 - Disable GTest on Windows. r=gps
authorBenoit Girard <b56girard@gmail.com>
Thu, 18 Jul 2013 16:29:17 -0400
changeset 139144 f69065d3d7638a81846130f3d15080cc1d5eec97
parent 139143 4c89002460da068084558b7e54d602d67362d667
child 139145 bdf71cb870acad987fdb9eed2ffe8d422330e50d
push idunknown
push userunknown
push dateunknown
reviewersgps
bugs886656
milestone25.0a1
Bug 886656 - Disable GTest on Windows. r=gps
testing/gtest/Makefile.in
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -25,19 +25,21 @@ LOCAL_INCLUDES += \
   -I$(srcdir)/gtest/include \
   -I$(srcdir)/gmock \
   -I$(srcdir)/gmock/include \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq (browser,$(MOZ_BUILD_APP))
-# Disable because of metro linking error:
+# Disable because of metro linking error bug 883339:
 # LNK1181: cannot open input file 'runtimeobject.lib'
-ifndef MOZ_METRO
+# And non metro linking error bug 886656:
+# LNK1112: module machine type 'x64' conflicts with target machine type 'X86'
+ifneq ($(OS_ARCH),WINNT)
 check gtest::
 	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(MAKE) -C $(DEPTH)/browser/app repackage
 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