From 83fdc47ab0460391f3109ead1620639df6b03f0b Mon Sep 17 00:00:00 2001
From: Christian Holler <choller@mozilla.com>
Date: Sat, 28 Sep 2013 00:48:06 +0200
Subject: [PATCH] Bug 920055 - Honor install-strip and STRIP_FLAGS when
 packaging tests. r=ted

--HG--
extra : rebase_source : 6845c548309113cecdf30d6ca3a885b39b0c0d03
---
 testing/testsuite-targets.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 1ab3d5ae614..d1689da9e32 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -496,10 +496,16 @@ stage-modules: make-stage-dir
 
 CPP_UNIT_TEST_BINS=$(wildcard $(DIST)/cppunittests/*)
 
+ifdef OBJCOPY
+ifndef PKG_SKIP_STRIP
+STRIP_CPP_TESTS := 1
+endif
+endif
+
 stage-cppunittests:
 	$(NSINSTALL) -D $(PKG_STAGE)/cppunittests
-ifdef OBJCOPY
-	$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) --strip-unneeded $(bin) $(bin:$(DIST)/%=$(PKG_STAGE)/%);)
+ifdef STRIP_CPP_TESTS
+	$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) $(STRIP_FLAGS) $(bin) $(bin:$(DIST)/%=$(PKG_STAGE)/%);)
 else
 	cp -RL $(DIST)/cppunittests $(PKG_STAGE)
 endif