Backed out changeset 7886dc6ae0c8 - bug 549427 - tests tarball should be zip files (CLOSED TREE)
authorTed Mielczarek <ted.mielczarek@gmail.com>
Wed, 07 Apr 2010 13:32:06 -0400
changeset 40540 f843e0928e1119d1fbafba72e5ed1aea575fbbe5
parent 40539 7886dc6ae0c8ca8d769b956561174c0acc8b4340
child 40544 24f6f5e405f7e465e437d0b1855b798c6c5bd860
push id12657
push usertmielczarek@mozilla.com
push dateWed, 07 Apr 2010 17:34:08 +0000
treeherdermozilla-central@f843e0928e11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs549427
milestone1.9.3a4pre
backs out7886dc6ae0c8ca8d769b956561174c0acc8b4340
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Backed out changeset 7886dc6ae0c8 - bug 549427 - tests tarball should be zip files (CLOSED TREE)
testing/testsuite-targets.mk
toolkit/mozapps/installer/package-name.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -126,19 +126,17 @@ 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)
-	@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
-	cd $(PKG_STAGE) && \
-	  zip -r9D "../$(PKG_PATH)$(TEST_PACKAGE)" *
+	@(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
 
 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.zip
+TEST_PACKAGE = $(PKG_BASENAME).tests.tar.bz2
 
 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))