diff options
| author | Simon Glass <sjg@chromium.org> | 2016-07-03 09:40:36 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-14 18:22:33 -0400 |
| commit | 0671960beee89da3016f40d059df4a14f257d442 (patch) | |
| tree | 07923710a2bcc53af60b6cb4316f095b51a6c8de /test | |
| parent | b9c771b04c215de981987a92d5e1f016c8dd1921 (diff) | |
| download | u-boot-0671960beee89da3016f40d059df4a14f257d442.tar.gz u-boot-0671960beee89da3016f40d059df4a14f257d442.tar.bz2 u-boot-0671960beee89da3016f40d059df4a14f257d442.zip | |
test/py: Allow tests to control the sandbox device-tree file
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>
Reviewed-by: Teddy Reed <teddy.reed@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/py/conftest.py | 1 | ||||
| -rw-r--r-- | test/py/u_boot_console_sandbox.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/py/conftest.py b/test/py/conftest.py index 449f98bee3..5b16456e6b 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 04654ae8c9..b4404971c4 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) |