Backed out changeset 3a5789d0e7e0 (bug 883339) suspicion of causing Exception: Ambiguous symbol file for xul.pdb failure on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 24 Jun 2014 13:35:26 +0200
changeset 190418 5a8e5ad43d90068d41d0094c40829c968a3274f0
parent 190417 e68dcb0c572cdf825ddcd9653e6341da360249f0
child 190419 de2f8eca84b1afee1f5e286aa1874a7823ebf18f
push id45310
push usercbook@mozilla.com
push dateTue, 24 Jun 2014 11:35:36 +0000
treeherdermozilla-inbound@5a8e5ad43d90 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs883339
milestone33.0a1
backs out3a5789d0e7e010b951a92d3809ca26b2e6540ec4
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
Backed out changeset 3a5789d0e7e0 (bug 883339) suspicion of causing Exception: Ambiguous symbol file for xul.pdb failure on a CLOSED TREE
client.mk
configure.in
testing/gtest/Makefile.in
--- a/client.mk
+++ b/client.mk
@@ -124,17 +124,16 @@ export FOUND_MOZCONFIG
 MOZCONFIG_OUT_LINES := $(subst $(CR), ,$(subst $(NULL) $(NULL),||,$(MOZCONFIG_CONTENT)))
 # Filter-out comments from those lines.
 START_COMMENT = \#
 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))
   MOZ_MAKE_FLAGS += -j$(MOZ_PARALLEL_BUILD)
 endif
 
 # Automatically add -jN to make flags if not defined. N defaults to number of cores.
 ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS)))
--- a/configure.in
+++ b/configure.in
@@ -6792,17 +6792,16 @@ fi
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST(MOZ_OPTIMIZE)
 AC_SUBST(MOZ_FRAMEPTR_FLAGS)
 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 ========================================================
 dnl = Enable any treating of compile warnings as errors
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(warnings-as-errors,
 [  --enable-warnings-as-errors
                           Enable treating of warnings as errors],
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -2,34 +2,29 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Avoid recursive make to avoid having to add files to the gtest/ subdirectory
 # (which is third-party code), and to make the build faster.
 
 include $(topsrcdir)/config/rules.mk
 
-# Bug 1028035: Linking xul-gtest.dll takes too long, so we disable GTest on
-# Windows PGO builds.
-ifeq (1WINNT,$(MOZ_PGO)$(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