Bug 1306405 - add BUILDSTATUS messages to the tup backend; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Mon, 26 Sep 2016 14:16:09 -0400
changeset 315797 e77235072dd46edbdf8ae3ba564c1302e2730f89
parent 315796 878008bf7bec5df6244a9b9b7693821abea44dba
child 315798 b974a64f96bc986f139fc388feff4509fb59f264
push id20634
push usercbook@mozilla.com
push dateFri, 30 Sep 2016 10:10:13 +0000
treeherderfx-team@afe79b010d13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1306405
milestone52.0a1
Bug 1306405 - add BUILDSTATUS messages to the tup backend; r=chmanchester MozReview-Commit-ID: HoDUuKkmv2l
Makefile.in
python/mozbuild/mozbuild/backend/tup.py
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,18 +167,24 @@ install-manifests: $(addprefix install-,
 ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 install-manifests: faster
 .PHONY: faster
 faster: install-dist/idl
 	$(MAKE) -C faster FASTER_RECURSIVE_MAKE=1
 endif
 
 .PHONY: tup
-tup: install-manifests buildid.h source-repo.h
+tup:
+	$(call BUILDSTATUS,TIERS make tup)
+	$(call BUILDSTATUS,TIER_START make)
+	$(MAKE) install-manifests buildid.h source-repo.h
+	$(call BUILDSTATUS,TIER_FINISH make)
+	$(call BUILDSTATUS,TIER_START tup)
 	@$(TUP) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose)
+	$(call BUILDSTATUS,TIER_FINISH tup)
 
 # process_install_manifest needs to be invoked with --no-remove when building
 # js as standalone because automated builds are building nspr separately and
 # that would remove the resulting files.
 # Eventually, a standalone js build would just be able to build nspr itself,
 # removing the need for the former.
 ifdef JS_STANDALONE
 NO_REMOVE=1
--- a/python/mozbuild/mozbuild/backend/tup.py
+++ b/python/mozbuild/mozbuild/backend/tup.py
@@ -335,11 +335,10 @@ class TupOnly(CommonBackend, PartialBack
             check_unchanged=True,
         )
 
 
 class TupBackend(HybridBackend(TupOnly, RecursiveMakeBackend)):
     def build(self, config, output, jobs, verbose):
         status = config._run_make(directory=self.environment.topobjdir, target='tup',
                                   line_handler=output.on_line, log=False, print_directory=False,
-                                  ensure_exit_code=False, num_jobs=jobs, silent=not verbose,
-                                  append_env={b'NO_BUILDSTATUS_MESSAGES': b'1'})
+                                  ensure_exit_code=False, num_jobs=jobs, silent=not verbose)
         return status