diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-07 16:40:02 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-08 11:43:23 -0600 |
| commit | ff61d6bfd1c9534d3fc2397846a5899639f2e55d (patch) | |
| tree | dcfe4bc52848a5637c975a3352b57885e5b8a06d /test/py/tests/test_ofplatdata.py | |
| parent | 34820924edbc4ec7803eb89d9852f4b870fa760a (diff) | |
| parent | f892a7f397a66d8d09f418d1e0e06dfb48bac27d (diff) | |
Merge branch 'next'
Note that this undoes the changes of commit cf6d4535cc4c ("x86:
emulation: Disable bloblist for now") as that was intended only for the
release due to time.
Diffstat (limited to 'test/py/tests/test_ofplatdata.py')
| -rw-r--r-- | test/py/tests/test_ofplatdata.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index 51a188454f3..d31fa55f7c7 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -2,16 +2,15 @@ # Copyright (c) 2016 Google, Inc import pytest -import u_boot_utils as util +import utils @pytest.mark.boardspec('sandbox_spl') @pytest.mark.buildconfigspec('spl_of_platdata') -def test_spl_devicetree(u_boot_console): +def test_spl_devicetree(ubman): """Test content of spl device-tree""" - cons = u_boot_console - dtb = cons.config.build_dir + '/spl/u-boot-spl.dtb' - fdtgrep = cons.config.build_dir + '/tools/fdtgrep' - output = util.run_and_log(cons, [fdtgrep, '-l', dtb]) + dtb = ubman.config.build_dir + '/spl/u-boot-spl.dtb' + fdtgrep = ubman.config.build_dir + '/tools/fdtgrep' + output = utils.run_and_log(ubman, [fdtgrep, '-l', dtb]) assert "bootph-all" not in output assert "bootph-some-ram" not in output |