GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-23 07:01:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'buildman' of git://git.denx.de/u-boot-x86

Browse source
This commit is contained in:
Tom Rini 2015-03-05 18:30:38 -05:00
commit 62f3aaf89d
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/buildman/builder.py
View file

@ -664,7 +664,7 @@ class Builder:
arch = 'unknown' arch = 'unknown'
str = self.col.Color(color, ' ' + target) str = self.col.Color(color, ' ' + target)
if not arch in done_arch: if not arch in done_arch:
str = self.col.Color(color, char) + ' ' + str str = ' %s %s' % (self.col.Color(color, char), str)
done_arch[arch] = True done_arch[arch] = True
if not arch in arch_list: if not arch in arch_list:
arch_list[arch] = str arch_list[arch] = str

2
tools/buildman/test.py
View file

@ -169,7 +169,7 @@ class TestBuild(unittest.TestCase):
expected_colour = col.GREEN if ok else col.RED expected_colour = col.GREEN if ok else col.RED
expect = '%10s: ' % arch expect = '%10s: ' % arch
# TODO(sjg@chromium.org): If plus is '', we shouldn't need this # TODO(sjg@chromium.org): If plus is '', we shouldn't need this
expect += col.Color(expected_colour, plus) expect += ' ' + col.Color(expected_colour, plus)
expect += ' ' expect += ' '
for board in boards: for board in boards:
expect += col.Color(expected_colour, ' %s' % board) expect += col.Color(expected_colour, ' %s' % board)

10
tools/buildman/toolchain.py
View file

@ -465,11 +465,15 @@ class Toolchains:
# Check that the toolchain works # Check that the toolchain works
print 'Testing' print 'Testing'
dirpath = os.path.join(dest, path) dirpath = os.path.join(dest, path)
compiler_fname = self.ScanPath(dirpath, True) compiler_fname_list = self.ScanPath(dirpath, True)
if not compiler_fname: if not compiler_fname_list:
print 'Could not locate C compiler - fetch failed.' print 'Could not locate C compiler - fetch failed.'
return 1 return 1
toolchain = Toolchain(compiler_fname, True, True) if len(compiler_fname_list) != 1:
print ('Internal error, ambiguous toolchains: %s' %
(', '.join(compiler_fname)))
return 1
toolchain = Toolchain(compiler_fname_list[0], True, True)
# Make sure that it will be found by buildman # Make sure that it will be found by buildman
if not self.TestSettingsHasPath(dirpath): if not self.TestSettingsHasPath(dirpath):