summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-05 18:30:38 -0500
committerTom Rini <trini@konsulko.com>2015-03-05 20:50:31 -0500
commit62f3aaf89d01bdc9ff0e67d92f3bf085143edf8c (patch)
tree6b6adbba82b3e42cf3330b67ff06f86926257f94
parent65994d049474394729d976273d7582552f1db332 (diff)
parent63c619eefde619731370b42ae2a2c16a86b23597 (diff)
downloadu-boot-imx-62f3aaf89d01bdc9ff0e67d92f3bf085143edf8c.zip
u-boot-imx-62f3aaf89d01bdc9ff0e67d92f3bf085143edf8c.tar.gz
u-boot-imx-62f3aaf89d01bdc9ff0e67d92f3bf085143edf8c.tar.bz2
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
-rw-r--r--tools/buildman/builder.py2
-rw-r--r--tools/buildman/test.py2
-rw-r--r--tools/buildman/toolchain.py10
3 files changed, 9 insertions, 5 deletions
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index 1b0ad99..54f3292 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -664,7 +664,7 @@ class Builder:
arch = 'unknown'
str = self.col.Color(color, ' ' + target)
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
if not arch in arch_list:
arch_list[arch] = str
diff --git a/tools/buildman/test.py b/tools/buildman/test.py
index c0ad5d0..7642d94 100644
--- a/tools/buildman/test.py
+++ b/tools/buildman/test.py
@@ -169,7 +169,7 @@ class TestBuild(unittest.TestCase):
expected_colour = col.GREEN if ok else col.RED
expect = '%10s: ' % arch
# 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 += ' '
for board in boards:
expect += col.Color(expected_colour, ' %s' % board)
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 537797a..051da11 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -465,11 +465,15 @@ class Toolchains:
# Check that the toolchain works
print 'Testing'
dirpath = os.path.join(dest, path)
- compiler_fname = self.ScanPath(dirpath, True)
- if not compiler_fname:
+ compiler_fname_list = self.ScanPath(dirpath, True)
+ if not compiler_fname_list:
print 'Could not locate C compiler - fetch failed.'
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
if not self.TestSettingsHasPath(dirpath):