From be338a5149da998cc8366de69d788d04a64688e1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 15 Oct 2014 14:34:41 +0200 Subject: buildman: Fix repeating board list with -l Ensure that we don't print duplicate board names when -l is used. Change-Id: I56adb138fc18f772ba61eba0fa194cdd7bc7efc6 Signed-off-by: Simon Glass Reported-by: Albert Aribaud --- tools/buildman/builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 8155c1681e..7002034221 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -918,7 +918,8 @@ class Builder: if self._list_error_boards: names = [] for board in line_boards[line]: - names.append(board.target) + if not board.target in names: + names.append(board.target) names_str = '(%s) ' % ','.join(names) else: names_str = '' -- cgit v1.2.1 From 58d818f19f349fc17a3907b2be62a6d2d2dc242b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 15 Oct 2014 14:37:25 +0200 Subject: buildman: Don't default to -e when using -s When using summary mode (-s) we don't always want to display errors. Allow this option to be omitted. Series-to: u-boot Series-cc: albert Change-Id: I6b37754d55eb920ecae114fceba55834b43ea3b9 Signed-off-by: Simon Glass Reported-by: Albert Aribaud --- tools/buildman/control.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8b8c826002..6a4de36681 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -188,7 +188,8 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, else: series = None options.verbose = True - options.show_errors = True + if not options.summary: + options.show_errors = True # By default we have one thread per CPU. But if there are not enough jobs # we can have fewer threads and use a high '-j' value for make. -- cgit v1.2.1 From 1ddda1b321a102b31bcddc0b1cc23fe3449533c6 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 15 Oct 2014 02:27:00 -0600 Subject: patman: Use the full commit hash for 'git checkout' Even with the initial 8 characeters of the hash we will sometimes get a collision. Use the full hash. Signed-off-by: Simon Glass --- tools/buildman/control.py | 2 +- tools/patman/patchstream.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 6a4de36681..fb79a1ecfe 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -70,7 +70,7 @@ def ShowActions(series, why_selected, boards_selected, builder, options): if commits: for upto in range(0, len(series.commits), options.step): commit = series.commits[upto] - print ' ', col.Color(col.YELLOW, commit.hash, bright=False), + print ' ', col.Color(col.YELLOW, commit.hash[:8], bright=False), print commit.subject print for arg in why_selected: diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index d630157f8f..da0488337b 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -248,8 +248,7 @@ class PatchStream: # Detect the start of a new commit elif commit_match: self.CloseCommit() - # TODO: We should store the whole hash, and just display a subset - self.commit = commit.Commit(commit_match.group(1)[:8]) + self.commit = commit.Commit(commit_match.group(1)) # Detect tags in the commit message elif tag_match: -- cgit v1.2.1