Bug 1079520: Ensure that GTest can also be run via mach on OSX. r=bsmedberg
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Wed, 08 Oct 2014 10:48:06 -0400
changeset 209356 c879f190a7fd05bcee58ccd597125d72499e8658
parent 209355 bc30d29aaa7d45f04bcc1c66f0902dbc7478ab40
child 209357 51d3f2b58ac164a9a0ecb5ee20499373c1d219e2
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbsmedberg
bugs1079520
milestone35.0a1
Bug 1079520: Ensure that GTest can also be run via mach on OSX. r=bsmedberg
browser/app/macbuild/Contents/MacOS-files.in
testing/gtest/Makefile.in
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -1,9 +1,10 @@
 /*.app/***
 /*.dylib
 /certutil
 /firefox-bin
+/gtest/***
 /pk12util
 /ssltunnel
 /webapprt-stub
 /xpcshell
 /XUL
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -20,18 +20,16 @@ gtest::
 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
-	rsync -a $(DIST)/bin/dependentlibs.list.gtest $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources
-	rsync -a $(DIST)/bin/gtest $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/
 	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
 		--cwd=$(DEPTH)/_tests/gtest \
 		--xre-path=$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources \
 		--symbols-path=$(DIST)/crashreporter-symbols \
 		$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
 		--cwd=$(DEPTH)/_tests/gtest \