bug 521156 - tests package only 160 bytes for universal mac builds since tracemonkey merge. fix a bad merge.
authorTed Mielczarek <ted.mielczarek@gmail.com>
Thu, 08 Oct 2009 06:39:23 -0400
changeset 33667 e36c57772b2ed1429c6a270f576e33b68b07d537
parent 33666 ee06be6166bc562aedae37510cec3b74ae48ad07
child 33668 7d0c4369c0d184a78678d831b79f743a4361cb7f
push idunknown
push userunknown
push dateunknown
bugs521156
milestone1.9.3a1pre
bug 521156 - tests package only 160 bytes for universal mac builds since tracemonkey merge. fix a bad merge.
testing/testsuite-targets.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -111,23 +111,23 @@ xpcshell-tests:
 	  $(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
+package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests
 else
 # This staging area has been built for us by universal/flight.mk
 PKG_STAGE = $(DIST)/universal/test-package-stage
 endif
 
-package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests
+package-tests:
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	@(cd $(PKG_STAGE) && tar $(TAR_CREATE_FLAGS) - *) | bzip2 -f > $(DIST)/$(PKG_PATH)$(TEST_PACKAGE)
 
 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
 
 stage-mochitest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package