From 52d40775491562fd0dbd4a03af7ce4432d586b9d Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Wed, 7 Apr 2010 13:32:06 -0400 Subject: [PATCH] Backed out changeset 7886dc6ae0c8 - bug 549427 - tests tarball should be zip files (CLOSED TREE) --- testing/testsuite-targets.mk | 4 +--- toolkit/mozapps/installer/package-name.mk | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 2bc0b731605a..d6f709c235fe 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -131,9 +131,7 @@ 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 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index f85018d63c48..675f958cbff7 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -168,7 +168,7 @@ endif # MOZ_PKG_PRETTYNAMES 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)