From 40f11fce7c686f2b51ae109c4085fb5988c5631c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 5 Feb 2015 22:06:12 -0700 Subject: buildman: Show 'make' command line when -V is used When a verbose build it selected, show the make command before the output of that command. Signed-off-by: Simon Glass --- tools/buildman/builder.py | 3 +++ tools/buildman/builderthread.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 54f3292..72353b9 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -335,6 +335,9 @@ class Builder: cmd = [self.gnu_make] + list(args) result = command.RunPipe([cmd], capture=True, capture_stderr=True, cwd=cwd, raise_on_error=False, **kwargs) + if self.verbose_build: + result.stdout = '%s\n' % (' '.join(cmd)) + result.stdout + result.combined = '%s\n' % (' '.join(cmd)) + result.combined return result def ProcessResult(self, result): diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index efb62f1..6ad240d 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -209,14 +209,17 @@ class BuilderThread(threading.Thread): if do_config: result = self.Make(commit, brd, 'mrproper', cwd, 'mrproper', *args, env=env) + config_out = result.combined result = self.Make(commit, brd, 'config', cwd, *(args + config_args), env=env) - config_out = result.combined + config_out += result.combined do_config = False # No need to configure next time if result.return_code == 0: result = self.Make(commit, brd, 'build', cwd, *args, env=env) result.stderr = result.stderr.replace(src_dir + '/', '') + if self.builder.verbose_build: + result.stdout = config_out + result.stdout else: result.return_code = 1 result.stderr = 'No tool chain for %s\n' % brd.arch -- cgit v1.1