Follow-up to bug 1061688 - Expand xpcshell on mozharness for Thunderbird to gecko 33. Port packaging of the mozharness config dir. rs=port-by-build-system-peer and bustage-fix for CLOSED TREE
authorMark Banner <standard8@mozilla.com>
Tue, 02 Sep 2014 21:57:12 +0100
changeset 20617 ccab5292db9b893ac78b3928f1721ff861be14fb
parent 20616 842e0fd167ee65c2a722f4cb87388fcefea71c85
child 20618 91298d293561678091a2339027f4b1668769104d
push id1210
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 20:57:35 +0000
treeherdercomm-beta@ccab5292db9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersport-by-build-system-peer
bugs1061688
Follow-up to bug 1061688 - Expand xpcshell on mozharness for Thunderbird to gecko 33. Port packaging of the mozharness config dir. rs=port-by-build-system-peer and bustage-fix for CLOSED TREE
mail/testsuite-targets.mk
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -46,17 +46,17 @@ mozmill-one:
 	--plugins-path=$(abspath $(DIST)/plugins) \
 	$(MOZMILL_EXTRA)
 
 # XXX The mozilla/testing/testsuite-targets.mk doesn't really allow for hooks
 # outside of itself. Therefore we replicate the functionality we need here,
 # calling into the relevant mozilla dirs when necessary for the core tests.
 ifndef UNIVERSAL_BINARY
 PKG_STAGE = $(DIST)/test-stage
-package-tests:: stage-mozilla-tests stage-mozmill stage-modules
+package-tests:: stage-mozilla-tests stage-mozmill stage-modules stage-config
 
 # If Lightning is enabled, also stage the lightning extension
 ifdef MOZ_CALENDAR
 package-tests:: stage-calendar
 endif
 
 else
 # This staging area has been built for us by universal/flight.mk
@@ -68,17 +68,17 @@ package-tests::
 ifndef UNIVERSAL_BINARY
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 endif
 	cd $(PKG_STAGE) && \
 	  zip -r9D '$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)' \
 	  * -x \*/.mkdir.done
 
 make-stage-dir:
-	rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs && $(NSINSTALL) -D $(PKG_STAGE)/extensions
+	rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs && $(NSINSTALL) -D $(PKG_STAGE)/extensions && $(NSINSTALL) -D $(PKG_STAGE)/config
 
 # Of the core tests, we only currently support xpcshell. Unfortunately
 # some of the required xpcshell bits are packaged by mochitest, so we have to
 # package those as well.
 stage-mozilla-tests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/mozilla/layout/tools/reftest stage-package
 	$(MAKE) -C $(DEPTH)/mozilla/testing/mochitest stage-package
 	$(MAKE) -C $(DEPTH)/mozilla/testing/xpcshell stage-package
@@ -86,16 +86,20 @@ stage-mozilla-tests: make-stage-dir
 
 # Although we should probably depend on make-stage-dir here, we don't as the
 # make-stage-dir actually removes the package directory for us. Given that we
 # are running stage-mozilla-tests which calls testing/testsuite-targets.mk which
 # does do this for some tests, then we're actually fine.
 stage-mozmill: make-stage-dir
 	$(MAKE) -C $(DEPTH)/mail/test/mozmill stage-package
 
+stage-config: make-stage-dir
+	$(NSINSTALL) -D $(PKG_STAGE)/config
+	@(cd $(MOZILLA_DIR)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -)
+
 stage-modules: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/modules
 	cp -RL $(DEPTH)/mozilla/_tests/modules $(PKG_STAGE)
 
 stage-calendar: make-stage-dir
 	$(MAKE) -C $(DEPTH)/calendar/lightning stage-package
 
 .PHONY: \