Bug 1059943: use dozip instead of zip to create test XPIs so we get deterministic output. r=gps
☠☠ backed out by 3ea1323faff9 ☠ ☠
authorChris AtLee <catlee@mozilla.com>
Fri, 23 Jan 2015 09:56:58 -0500
changeset 225317 dd3798ef3f430a7bc4558fd952da25c6cd63f508
parent 225316 784b54d929297924db0a6a62bf9e7dec84648b79
child 225318 a919a64df9ef5954ba511cc5f6e1d76b209be003
push id54535
push usercatlee@mozilla.com
push dateFri, 23 Jan 2015 14:57:43 +0000
treeherdermozilla-inbound@dd3798ef3f43 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1059943
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1059943: use dozip instead of zip to create test XPIs so we get deterministic output. r=gps
toolkit/mozapps/extensions/test/Makefile.in
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -3,18 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ADDONSRC = $(srcdir)/addons
 TESTROOT = $(CURDIR)/$(DEPTH)/_tests/xpcshell/$(relativesrcdir)
 TESTXPI = $(TESTROOT)/xpcshell/addons
 
 include $(topsrcdir)/config/rules.mk
 
+DOZIP := $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/dozip.py
+
 libs::
 	rm -rf $(TESTXPI)
 	$(NSINSTALL) -D $(TESTXPI)
 	if [ -d $(ADDONSRC) ]; then \
 		$(EXIT_ON_ERROR) \
 		for dir in $(ADDONSRC)/*; do \
 			base=`basename $$dir` ; \
-			(cd $$dir && zip -qr $(TESTXPI)/$$base.xpi *) \
+			(cd $$dir && $(DOZIP) $(TESTXPI)/$$base.xpi *) \
 		done \
 	fi