bug 549427 - tests tarball should be zip files r=ted.mielczarek
☠☠ backed out by f843e0928e11 ☠ ☠
authorJohn Ford <jhford@mozilla.com>
Wed, 10 Mar 2010 18:01:00 -0500
changeset 40539 7886dc6ae0c8ca8d769b956561174c0acc8b4340
parent 40538 722ff789df89c0dda5558a3fd554861c48557406
child 40540 f843e0928e1119d1fbafba72e5ed1aea575fbbe5
child 40546 d0ccd8f2be496d05b3df107706cab59e5890f461
push id12656
push usertmielczarek@mozilla.com
push dateWed, 07 Apr 2010 17:15:26 +0000
treeherdermozilla-central@7886dc6ae0c8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs549427
milestone1.9.3a4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
bug 549427 - tests tarball should be zip files r=ted.mielczarek
testing/testsuite-targets.mk
toolkit/mozapps/installer/package-name.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -126,17 +126,19 @@ PKG_STAGE = $(DIST)/test-package-stage
 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:
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	@(cd $(PKG_STAGE) && tar $(TAR_CREATE_FLAGS) - *) | bzip2 -f > "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
+	@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
+	cd $(PKG_STAGE) && \
+	  zip -r9D "../$(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
 
 stage-reftest: make-stage-dir
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -163,17 +163,17 @@ PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME
 PKG_SRCPACK_PATH = source/
 
 endif # MOZ_PKG_PRETTYNAMES
 
 # Symbol package naming
 SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
 
 # Test package naming
-TEST_PACKAGE = $(PKG_BASENAME).tests.tar.bz2
+TEST_PACKAGE = $(PKG_BASENAME).tests.zip
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
 else
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
 endif
 
 MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))