Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

test.py: Make search for autoconf.mk more permissive

Browse source 
Buildman doesn't store this file in the same directory as a normal build.
Update the conftest code to handle both cases.

Change-Id: I1fd0e56054d7dc77394a7589336aa0991bd0133d
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-01 19:34:18 -07:00
parent 4251fbc6fb
commit cb10579484
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
test/py/conftest.py
View file

@ -83,6 +83,26 @@ def pytest_configure(config):
Returns:
Nothing.
"""
def parse_config(conf_file):
"""Parse a config file, loading it into the ubconfig container
Args:
conf_file: Filename to load (within build_dir)
Raises
Exception if the file does not exist
"""
dot_config = build_dir + '/' + conf_file
if not os.path.exists(dot_config):
raise Exception(conf_file + ' does not exist; ' +
'try passing --build option?')
with open(dot_config, 'rt') as f:
ini_str = '[root]\n' + f.read()
ini_sio = io.StringIO(ini_str)
parser = configparser.RawConfigParser()
parser.read_file(ini_sio)
ubconfig.buildconfig.update(parser.items('root'))
global log
global console
@ -157,18 +177,13 @@ def pytest_configure(config):
ubconfig.buildconfig = dict()
for conf_file in ('.config', 'include/autoconf.mk'):
dot_config = build_dir + '/' + conf_file
if not os.path.exists(dot_config):
raise Exception(conf_file + ' does not exist; ' +
'try passing --build option?')
with open(dot_config, 'rt') as f:
ini_str = '[root]\n' + f.read()
ini_sio = io.StringIO(ini_str)
parser = configparser.RawConfigParser()
parser.read_file(ini_sio)
ubconfig.buildconfig.update(parser.items('root'))
# buildman -k puts autoconf.mk in the rootdir, so handle this as well
# as the standard U-Boot build which leaves it in include/autoconf.mk
parse_config('.config')
if os.path.exists(build_dir + '/' + 'autoconf.mk'):
parse_config('autoconf.mk')
else:
parse_config('include/autoconf.mk')
ubconfig.test_py_dir = test_py_dir
ubconfig.source_dir = source_dir