Bug 1014804 - Make the gtest make target only compile the tests, and not run them. r=BenWa, r=ted

This commit is contained in:
Markus Stange 2014-06-04 21:17:44 +02:00
parent 4c459289ac
commit 2086bfa06c

View File

@ -14,7 +14,12 @@ ifeq (browser,$(MOZ_BUILD_APP))
# LNK1112: module machine type 'x64' conflicts with target machine type 'X86' # LNK1112: module machine type 'x64' conflicts with target machine type 'X86'
ifneq ($(OS_ARCH),WINNT) ifneq ($(OS_ARCH),WINNT)
ifdef COMPILE_ENVIRONMENT 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 $(MAKE) -C $(DEPTH)/toolkit/library gtestxul
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
$(MAKE) -C $(DEPTH)/browser/app repackage $(MAKE) -C $(DEPTH)/browser/app repackage