Bug 1014804 - Make the gtest make target only compile the tests, and not run them. r=BenWa, r=ted
authorMarkus Stange <mstange@themasta.com>
Wed, 04 Jun 2014 21:17:44 +0200
changeset 186672 d8b1d6c4dd4eed28ff92a78b182b66d902f89514
parent 186671 12536416d070ca1cfc4e2bdf0e9b1ec5d426c61a
child 186673 0044cb69854ae5605c46dd66a9469e98a511f3df
push id26898
push usercbook@mozilla.com
push dateThu, 05 Jun 2014 12:20:57 +0000
treeherdermozilla-central@e99a707fc216 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBenWa, ted
bugs1014804
milestone32.0a1
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
Bug 1014804 - Make the gtest make target only compile the tests, and not run them. r=BenWa, r=ted
testing/gtest/Makefile.in
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -9,17 +9,22 @@ 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::
+gtest::
+	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+	$(MAKE) -C $(DEPTH)/browser/app repackage
+endif
+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)
 endif
 endif
 endif