bug 1237619: save resource usage for "what" builds r=gps
authorDan Minor <dminor@mozilla.com>
Thu, 07 Jan 2016 14:18:36 -0500
changeset 279776 f5ef13bfbf24b683f8dd1af8e9793072b389f77e
parent 279775 068ab119a0f781ba85e34ec25e55efde1ca733ec
child 279777 058ed31232d1d6398467848572a776447a3bda6b
push id70200
push userdminor@mozilla.com
push dateWed, 13 Jan 2016 13:16:25 +0000
treeherdermozilla-inbound@e7b44cddd003 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1237619: save resource usage for "what" builds r=gps This moves monitor start/end recording so it also occurs for "what" builds rather than only for full builds.
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -320,16 +320,18 @@ class Build(MachCommandBase):
                 return 1
             if directory is not None:
                 directory = mozpath.normsep(directory)
                 if directory.startswith('/'):
                     directory = directory[1:]
+            status = None
+            monitor.start_resource_recording()
             if what:
                 top_make = os.path.join(self.topobjdir, 'Makefile')
                 if not os.path.exists(top_make):
                     print('Your tree has not been configured yet. Please run '
                         '|mach build| with no arguments.')
                     return 1
                 # Collect target pairs.
@@ -412,17 +414,16 @@ class Build(MachCommandBase):
                     # need to run configure.  The client.mk invocation below
                     # will configure, which will run config.status, which will
                     # invoke |mach artifact install| itself before continuing
                     # the build.  Therefore, we needn't install artifacts
                     # ourselves.
                     self.log(logging.DEBUG, 'artifact',
                              {}, "Not running |mach artifact install| -- it will be run by client.mk.")
-                monitor.start_resource_recording()
                 status = self._run_make(srcdir=True, filename='client.mk',
                     line_handler=output.on_line, log=False, print_directory=False,
                     allow_parallel=False, ensure_exit_code=False, num_jobs=jobs,
                     silent=not verbose)
                 make_extra = self.mozconfig['make_extra'] or []
                 make_extra = dict(m.split('=', 1) for m in make_extra)