From: Simon Glass <sjg@chromium.org>
Date: Tue, 2 Dec 2014 00:34:04 +0000 (-0700)
Subject: buildman: Don't use the local settings when running tests
X-Git-Tag: v2015.04-rc1~85^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc935295f24580a4cb7c869f489ea99273fb4f92;p=oweals%2Fu-boot.git

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>
---

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)