Bug 978211 - various asan/mar/pretty/mach fixes; r=glandium

- Linux ASAN nightly builds do not do update packaging
 - Only set mar properties if the mar file was actually created
 - Unset MOZ_SIGN_CMD for pretty-* steps
This commit is contained in:
Mike Shal 2014-07-03 22:14:59 -04:00
parent edaa3387d9
commit 042baef625
3 changed files with 7 additions and 8 deletions

View File

@ -256,23 +256,23 @@ update-packaging:
.PHONY: pretty-package
pretty-package:
$(MAKE) package MOZ_PKG_PRETTYNAMES=1
unset MOZ_SIGN_CMD && $(MAKE) package MOZ_PKG_PRETTYNAMES=1
.PHONY: pretty-package-tests
pretty-package-tests:
$(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
unset MOZ_SIGN_CMD && $(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
.PHONY: pretty-l10n-check
pretty-l10n-check:
$(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
unset MOZ_SIGN_CMD && $(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
.PHONY: pretty-update-packaging
pretty-update-packaging:
$(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
.PHONY: pretty-installer
pretty-installer:
$(MAKE) installer MOZ_PKG_PRETTYNAMES=1
unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
#XXX: this is a hack, since we don't want to clobber for MSVC
# PGO support, but we can't do this test in client.mk

View File

@ -30,6 +30,8 @@ def getFileHashAndSize(filename):
return (sha1Hash, size)
def getMarProperties(filename):
if not os.path.exists(filename):
return {}
(complete_mar_hash, complete_mar_size) = getFileHashAndSize(filename)
return {
'completeMarFilename': os.path.basename(filename),

View File

@ -1,6 +1,3 @@
if [ "x$IS_NIGHTLY" = "xyes" ]; then
MOZ_AUTOMATION_UPDATE_PACKAGING=1
fi
MOZ_AUTOMATION_TALOS_SENDCHANGE=0
MOZ_AUTOMATION_L10N_CHECK=0