Commit 62f3aaf89d01bdc9ff0e67d92f3bf085143edf8c
Exists in
v2017.01-smarct4x
and in
37 other branches
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
Showing 3 changed files Side-by-side Diff
tools/buildman/builder.py
| ... | ... | @@ -664,7 +664,7 @@ |
| 664 | 664 | arch = 'unknown' |
| 665 | 665 | str = self.col.Color(color, ' ' + target) |
| 666 | 666 | if not arch in done_arch: |
| 667 | - str = self.col.Color(color, char) + ' ' + str | |
| 667 | + str = ' %s %s' % (self.col.Color(color, char), str) | |
| 668 | 668 | done_arch[arch] = True |
| 669 | 669 | if not arch in arch_list: |
| 670 | 670 | arch_list[arch] = str |
tools/buildman/test.py
| ... | ... | @@ -169,7 +169,7 @@ |
| 169 | 169 | expected_colour = col.GREEN if ok else col.RED |
| 170 | 170 | expect = '%10s: ' % arch |
| 171 | 171 | # TODO(sjg@chromium.org): If plus is '', we shouldn't need this |
| 172 | - expect += col.Color(expected_colour, plus) | |
| 172 | + expect += ' ' + col.Color(expected_colour, plus) | |
| 173 | 173 | expect += ' ' |
| 174 | 174 | for board in boards: |
| 175 | 175 | expect += col.Color(expected_colour, ' %s' % board) |
tools/buildman/toolchain.py
| ... | ... | @@ -465,11 +465,15 @@ |
| 465 | 465 | # Check that the toolchain works |
| 466 | 466 | print 'Testing' |
| 467 | 467 | dirpath = os.path.join(dest, path) |
| 468 | - compiler_fname = self.ScanPath(dirpath, True) | |
| 469 | - if not compiler_fname: | |
| 468 | + compiler_fname_list = self.ScanPath(dirpath, True) | |
| 469 | + if not compiler_fname_list: | |
| 470 | 470 | print 'Could not locate C compiler - fetch failed.' |
| 471 | 471 | return 1 |
| 472 | - toolchain = Toolchain(compiler_fname, True, True) | |
| 472 | + if len(compiler_fname_list) != 1: | |
| 473 | + print ('Internal error, ambiguous toolchains: %s' % | |
| 474 | + (', '.join(compiler_fname))) | |
| 475 | + return 1 | |
| 476 | + toolchain = Toolchain(compiler_fname_list[0], True, True) | |
| 473 | 477 | |
| 474 | 478 | # Make sure that it will be found by buildman |
| 475 | 479 | if not self.TestSettingsHasPath(dirpath): |