Bug 883339: Enable "mach gtest" on Windows, but leave GTest disabled for "make check", r=glandium

--HG--
extra : rebase_source : e62eac1e5e70293d3c9df5406c996097abccbd3a

client.mk

@@ -129,6 +129,7 @@ MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))
 ifdef AUTOCLOBBER
 export AUTOCLOBBER=1
 endif
+export MOZ_PGO
 
 ifdef MOZ_PARALLEL_BUILD
   MOZ_MAKE_FLAGS := $(filter-out -j%,$(MOZ_MAKE_FLAGS))

configure.in

@@ -6798,6 +6798,7 @@ AC_SUBST(MOZ_OPTIMIZE_FLAGS)
 AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
 AC_SUBST(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
 AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
+AC_SUBST(MOZ_PGO)
 AC_SUBST(MOZ_PGO_OPTIMIZE_FLAGS)
 
 dnl ========================================================

testing/gtest/Makefile.in

@@ -7,24 +7,31 @@
 
 include $(topsrcdir)/config/rules.mk
 
+# Bug 1028035: Linking xul-gtest.dll takes too long, so we disable GTest on
+# Windows PGO builds.
+# Bug 1029469: fix_stack_using_bpsyms.py doesn't know how to deal with the
+# second xul.pdb file that linking xul-gtest.dll creates.
+ifeq (WINNT,$(OS_ARCH))
+SKIP_GTEST_DURING_MAKE_CHECK ?= 1
+endif
+
 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
 gtest::
 	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(MAKE) -C $(DEPTH)/browser/app repackage
 endif
+ifneq (1,$(SKIP_GTEST_DURING_MAKE_CHECK))
 check::
 	$(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)
+else
+check::
+	echo GTest skipped during make check
 endif
 endif
 endif