From e8c1a0cc2b5f88fbf3ffe55ca0a3e5fec23cf153 Mon Sep 17 00:00:00 2001 From: Stephen Pohl Date: Wed, 8 Oct 2014 10:48:06 -0400 Subject: [PATCH] Bug 1079520: Ensure that GTest can also be run via mach on OSX. r=bsmedberg --- browser/app/macbuild/Contents/MacOS-files.in | 1 + testing/gtest/Makefile.in | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index f600fae3f22..32ebf105f3e 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -2,6 +2,7 @@ /*.dylib /certutil /firefox-bin +/gtest/*** /pk12util /ssltunnel /webapprt-stub diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in index faf6c672d57..7f60a165d32 100644 --- a/testing/gtest/Makefile.in +++ b/testing/gtest/Makefile.in @@ -25,8 +25,6 @@ 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 \