summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-12-01 17:34:04 -0700
committerSimon Glass <sjg@chromium.org>2015-01-14 21:16:54 -0800
commitcc935295f24580a4cb7c869f489ea99273fb4f92 (patch)
tree227428104da0860cb6c38b2d3e4105b93a073ad0 /tools
parent7024ab6316ab18db8d1a25204a240111548357b4 (diff)
downloadtalos-obmc-uboot-cc935295f24580a4cb7c869f489ea99273fb4f92.tar.gz
talos-obmc-uboot-cc935295f24580a4cb7c869f489ea99273fb4f92.zip
buildman: Don't use the local settings when running tests
We should create a test setting file when running testes, not use whatever happens to be on the local machine. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/buildman/test.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/buildman/test.py b/tools/buildman/test.py
index c085d2f430..d19f6ea3d6 100644
--- a/tools/buildman/test.py
+++ b/tools/buildman/test.py
@@ -24,6 +24,16 @@ import commit
import terminal
import toolchain
+settings_data = '''
+# Buildman settings file
+
+[toolchain]
+main: /usr/sbin
+
+[toolchain-alias]
+x86: i386 x86_64
+'''
+
errors = [
'''main.c: In function 'main_loop':
main.c:260:6: warning: unused variable 'joe' [-Wunused-variable]
@@ -113,8 +123,11 @@ class TestBuild(unittest.TestCase):
self.boards.AddBoard(board.Board(*brd))
self.boards.SelectBoards([])
+ # Add some test settings
+ bsettings.Setup(None)
+ bsettings.AddFile(settings_data)
+
# Set up the toolchains
- bsettings.Setup()
self.toolchains = toolchain.Toolchains()
self.toolchains.Add('arm-linux-gcc', test=False)
self.toolchains.Add('sparc-linux-gcc', test=False)
OpenPOWER on IntegriCloud