Normally tests will run with the test.dtb file designed for this purpose. However, the verified boot tests need to run with their own device-tree file, containing a public key.
Make the device-tree file a config option so that it can be adjusted by tests. The default is to keep the current behaviour.
Signed-off-by: Simon Glass sjg@chromium.org ---
test/py/conftest.py | 1 + test/py/u_boot_console_sandbox.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/py/conftest.py b/test/py/conftest.py index 449f98b..5b16456 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -179,6 +179,7 @@ def pytest_configure(config): ubconfig.board_type = board_type ubconfig.board_identity = board_identity ubconfig.gdbserver = gdbserver + ubconfig.dtb = build_dir + '/arch/sandbox/dts/test.dtb'
env_vars = ( 'board_type', diff --git a/test/py/u_boot_console_sandbox.py b/test/py/u_boot_console_sandbox.py index 04654ae..b440497 100644 --- a/test/py/u_boot_console_sandbox.py +++ b/test/py/u_boot_console_sandbox.py @@ -46,7 +46,7 @@ class ConsoleSandbox(ConsoleBase): self.config.build_dir + '/u-boot', '-v', '-d', - self.config.build_dir + '/arch/sandbox/dts/test.dtb' + self.config.dtb ] return Spawn(cmd, cwd=self.config.source_dir)