Bug 908356 - In-tree reuqirements files for marionette and mozbase, r=aki
authorJonathan Griffin <jgriffin@mozilla.com>
Thu, 05 Sep 2013 17:36:16 -0700
changeset 145810 8b4a47eb12176d11f7f8688fd34983107cc06935
parent 145809 6cb722cd3f7cd98c3237b7de7d02e640b2df63e6
child 145811 1441bfd631067ac30c5cb5f18de15b75913faad9
push idunknown
push userunknown
push dateunknown
reviewersaki
bugs908356
milestone26.0a1
Bug 908356 - In-tree reuqirements files for marionette and mozbase, r=aki
testing/config/marionette_requirements.txt
testing/config/mozbase_requirements.txt
testing/testsuite-targets.mk
new file mode 100644
--- /dev/null
+++ b/testing/config/marionette_requirements.txt
@@ -0,0 +1,2 @@
+-r mozbase_requirements.txt
+../marionette
new file mode 100644
--- /dev/null
+++ b/testing/config/mozbase_requirements.txt
@@ -0,0 +1,13 @@
+../mozbase/manifestdestiny
+../mozbase/mozcrash
+../mozbase/mozdevice
+../mozbase/mozfile
+../mozbase/mozhttpd
+../mozbase/mozinfo
+../mozbase/mozinstall
+../mozbase/mozlog
+../mozbase/moznetwork
+../mozbase/mozprocess
+../mozbase/mozprofile
+../mozbase/mozrunner
+../mozbase/moztest
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -444,17 +444,18 @@ make-stage-dir:
 	$(NSINSTALL) -D $(PKG_STAGE)/peptest
 	$(NSINSTALL) -D $(PKG_STAGE)/mozbase
 	$(NSINSTALL) -D $(PKG_STAGE)/modules
 
 stage-b2g: make-stage-dir
 	$(NSINSTALL) $(topsrcdir)/b2g/test/b2g-unittest-requirements.txt $(PKG_STAGE)/b2g
 
 stage-config: make-stage-dir
-	$(NSINSTALL) $(topsrcdir)/testing/config/mozharness_config.py $(PKG_STAGE)/config
+	$(NSINSTALL) -D $(PKG_STAGE)/config
+	@(cd $(topsrcdir)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -)
 
 stage-mochitest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
 ifeq ($(MOZ_BUILD_APP),mobile/android)
 	$(NSINSTALL) $(DEPTH)/mobile/android/base/fennec_ids.txt $(PKG_STAGE)/mochitest
 endif
 
 stage-reftest: make-stage-dir