Bug 1077597 - force -j1 for {pretty-}package-tests; r=glandium
authorMike Shal <mshal@mozilla.com>
Fri, 03 Oct 2014 16:43:26 -0400
changeset 209574 af8dc8209353ffcdb208225717c645ba1225b6c6
parent 209573 61b3f3d9bffe987e2098c37df5447db3dd883747
child 209575 759c780b92a24eb1fb997e9ed58cb5447e59482d
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersglandium
bugs1077597
milestone35.0a1
Bug 1077597 - force -j1 for {pretty-}package-tests; r=glandium
build/moz-automation.mk
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -97,16 +97,20 @@ AUTOMATION_EXTRA_CMDLINE-check = -k
 # We need the log from make upload to grep it for urls in order to set
 # properties.
 AUTOMATION_EXTRA_CMDLINE-upload = 2>&1 | tee $(AUTOMATION_UPLOAD_OUTPUT)
 
 # Note: We have to force -j1 here, at least until bug 1036563 is fixed.
 AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1
 AUTOMATION_EXTRA_CMDLINE-pretty-l10n-check = -j1
 
+# And force -j1 here until bug 1077670 is fixed.
+AUTOMATION_EXTRA_CMDLINE-package-tests = -j1
+AUTOMATION_EXTRA_CMDLINE-pretty-package-tests = -j1
+
 # The commands only run if the corresponding MOZ_AUTOMATION_* variable is
 # enabled. This means, for example, if we enable MOZ_AUTOMATION_UPLOAD, then
 # 'buildsymbols' will only run if MOZ_AUTOMATION_BUILD_SYMBOLS is also set.
 # However, the target automation/buildsymbols will still be executed in this
 # case because it is a prerequisite of automation/upload.
 define automation_commands
 $(call BUILDSTATUS,TIER_START $1)
 @$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1)