Bug 1553481 - Filter out pdbs from CPP_UNIT_TEST_BINS so we don't try to strip them r=firefox-build-system-reviewers,dmajor a=jcristau
authorTom Ritter <tom@mozilla.com>
Wed, 22 May 2019 15:08:07 +0000
changeset 536408 42d37e2229abc02684df909b0a8c29f6a31b6f6b
parent 536407 3cc54d1aa9d214a78c5f46c437cc7aa2ecec94dd
child 536409 290e613b8b2211e41209565318a63cafe0671082
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, dmajor, jcristau
bugs1553481
milestone68.0
Bug 1553481 - Filter out pdbs from CPP_UNIT_TEST_BINS so we don't try to strip them r=firefox-build-system-reviewers,dmajor a=jcristau Differential Revision: https://phabricator.services.mozilla.com/D32141
testing/testsuite-targets.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -220,17 +220,21 @@ endif
 	cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/gtest
 
 stage-android: make-stage-dir
 	$(NSINSTALL) $(topsrcdir)/mobile/android/fonts $(DEPTH)/_tests/reftest
 	$(NSINSTALL) $(topsrcdir)/mobile/android/fonts $(DEPTH)/_tests/testing/mochitest
 	$(NSINSTALL) -D $(DEPTH)/_tests/reftest/hyphenation
 	$(NSINSTALL) $(wildcard $(topsrcdir)/intl/locales/*/hyphenation/*.dic) $(DEPTH)/_tests/reftest/hyphenation
 
+ifdef MOZ_COPY_PDBS
+CPP_UNIT_TEST_BINS=$(filter-out $(wildcard $(DIST)/cppunittests/*.pdb), $(wildcard $(DIST)/cppunittests/*))
+else
 CPP_UNIT_TEST_BINS=$(wildcard $(DIST)/cppunittests/*)
+endif
 
 stage-cppunittests: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/cppunittest
 ifdef STRIP_COMPILED_TESTS
 	$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(bin) $(bin:$(DIST)/cppunittests/%=$(PKG_STAGE)/cppunittest/%);)
 else
 	cp -RL $(CPP_UNIT_TEST_BINS) $(PKG_STAGE)/cppunittest
 endif