Bug 589005 Add download path to jetpack-latest.zip into m-c so buildbot can run jetpack tests r=ted a=NPOTB
authorClint Talbert <ctalbert@mozilla.com>
Tue, 14 Sep 2010 16:27:32 -0700
changeset 53832 6c0c4a7a25b87b488169cb78798acf4f95901392
parent 53831 898ac02c84b07d2b10a714f0d7db91e3b55eb842
child 53833 a1d900b2c5a48eb41bea7e741ce2379528a3b96f
push idunknown
push userunknown
push dateunknown
reviewersted, NPOTB
bugs589005
milestone2.0b7pre
Bug 589005 Add download path to jetpack-latest.zip into m-c so buildbot can run jetpack tests r=ted a=NPOTB
testing/jetpack/README.txt
testing/jetpack/jetpack-location.txt
testing/testsuite-targets.mk
new file mode 100644
--- /dev/null
+++ b/testing/jetpack/README.txt
@@ -0,0 +1,5 @@
+This directory contains a file used by buildbot to grab the location
+of the jetpack repo for running automated tests.  The jetpack test suite
+and the jetpack codebase and the jetpack tests all live in the jetpack
+repo indicated by the URL in jetpack-location.txt.
+
new file mode 100644
--- /dev/null
+++ b/testing/jetpack/jetpack-location.txt
@@ -0,0 +1,1 @@
+http://hg.mozilla.org/labs/jetpack-sdk/archive/tip.tar.bz2
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -120,34 +120,34 @@ xpcshell-tests:
 	  $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) \
 	  $(DIST)/bin/xpcshell
 
 # Package up the tests and test harnesses
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 ifndef UNIVERSAL_BINARY
 PKG_STAGE = $(DIST)/test-package-stage
-package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-mozmill 
+package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-mozmill stage-jetpack
 else
 # This staging area has been built for us by universal/flight.mk
 PKG_STAGE = $(DIST)/universal/test-package-stage
 endif
 
 package-tests:
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
 	cd $(PKG_STAGE) && \
 	  zip -r9D "$(call core_abspath,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE))" *
 
 ifeq (Android, $(OS_TARGET))
 package-tests: stage-android
 endif
 
 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
+	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)/jetpack
 
 stage-mochitest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
 
 stage-reftest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/layout/tools/reftest stage-package
 
 stage-xpcshell: make-stage-dir
@@ -157,14 +157,16 @@ stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
 stage-mozmill: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mozmill stage-package
 
 stage-android: make-stage-dir
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/sutAgentAndroid.apk $(PKG_STAGE)/bin
 
+stage-jetpack: make-stage-dir
+	$(NSINSTALL) $(topsrcdir)/testing/jetpack/jetpack-location.txt $(PKG_STAGE)/jetpack
 .PHONY: \
   mochitest mochitest-plain mochitest-chrome mochitest-a11y mochitest-ipcplugins \
   reftest crashtest \
   xpcshell-tests \
   jstestbrowser \
-  package-tests make-stage-dir stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-mozmill stage-android
+  package-tests make-stage-dir stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-mozmill stage-android stage-jetpack