From 5e606c6e947560e913177464e6ffdbf4b864b259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= Date: Wed, 11 Oct 2023 05:54:13 +0000 Subject: [PATCH] Bug 1850647 - make py_action emit BUILDSTATUS START and END lines for every action, r=glandium. Differential Revision: https://phabricator.services.mozilla.com/D190514 --- config/makefiles/functions.mk | 5 ++++- python/mozbuild/mozbuild/controller/building.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/makefiles/functions.mk b/config/makefiles/functions.mk index 93282c402965..432cc9248568 100644 --- a/config/makefiles/functions.mk +++ b/config/makefiles/functions.mk @@ -27,4 +27,7 @@ core_winabspath = $(error core_winabspath is unsupported) # # libs:: # $(call py_action,purge_manifests,_build_manifests/purge/foo.manifest) -py_action = $(PYTHON3) -m mozbuild.action.$(1) $(2) +py_action = \ + echo BUILDSTATUS START_$(1) $(2) ; \ + $(PYTHON3) -m mozbuild.action.$(1) $(2) ; \ + echo BUILDSTATUS END_$(1) $(2) diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py index 6cec749a0b39..d66acf999246 100644 --- a/python/mozbuild/mozbuild/controller/building.py +++ b/python/mozbuild/mozbuild/controller/building.py @@ -274,10 +274,10 @@ class BuildMonitor(MozbuildObject): self.resources.begin_marker("Object", args[0]) update_needed = False elif action.startswith("START_"): - self.resources.begin_marker(action[len("START_") :], args[0]) + self.resources.begin_marker(action[len("START_") :], " ".join(args)) update_needed = False elif action.startswith("END_"): - self.resources.end_marker(action[len("END_") :], args[0]) + self.resources.end_marker(action[len("END_") :], " ".join(args)) update_needed = False elif action == "BUILD_VERBOSE": build_dir = args[0]