Bug 1077670 - Package tests in parallel. r=gps
authorChris Manchester <cmanchester@mozilla.com>
Tue, 13 Oct 2015 14:10:10 -0700
changeset 267564 98c1a8a3de7f77f9a619dd0a0620d1a14749cf94
parent 267563 bf4b1c2d2a6eb3afd6c796969a4dd4f05c6804c6
child 267565 eac15c44cf3980d3b127c7650bd82a9988dba39a
push id15669
push usercbook@mozilla.com
push dateWed, 14 Oct 2015 10:49:00 +0000
treeherderfx-team@46ef1400ca8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1077670
milestone44.0a1
Bug 1077670 - Package tests in parallel. r=gps
build/moz-automation.mk
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -96,27 +96,23 @@ automation/update-packaging: automation/
 
 automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
 	@echo Automation steps completed.
 
 # 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
-@$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1)
+@+$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1)
 $(call BUILDSTATUS,TIER_FINISH $1)
 endef
 
 # The tier start message is in a separate target so make doesn't buffer it
 # until the step completes with output syncing enabled.
 automation-start/%:
 	$(if $(filter $*,$(MOZ_AUTOMATION_TIERS)),$(call BUILDSTATUS,TIER_START $*))