From: Simon Glass <sjg@chromium.org> The VBE test uses fdt_util to compile a devicetree. Other tests log the output of the dtc tool, which can be helpful when a test fails. For reasons which are unclear, using fdt_util means that the path to dtc ends up being './scripts/dtc/dtc' when run from 'make qcheck'. This causes a failure to set up the image required for the VBE test. Update the test to use the normal run_and_log() method instead. Signed-off-by: Simon Glass <sjg@chromium.org> --- test/py/tests/img/vbe.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/py/tests/img/vbe.py b/test/py/tests/img/vbe.py index 1e4c7df68aa..215d14a5ced 100644 --- a/test/py/tests/img/vbe.py +++ b/test/py/tests/img/vbe.py @@ -7,12 +7,10 @@ import gzip import os -import shutil import tempfile import utils from fs_helper import DiskHelper, FsHelper -from dtoc import fdt_util from u_boot_pylib import tools @@ -153,9 +151,8 @@ def setup_vbe_image(ubman): }; '''.replace(b'boot_slot', boot_slot.encode('utf-8'))) - dtb = fdt_util.EnsureCompiled(fname, ubman.config.result_dir) - print('dtb', dtb) - shutil.copy(dtb, f'{boot.srcdir}/vbe-state') + utils.run_and_log(ubman, ['dtc', fname, '-O', 'dtb', '-o', + f'{boot.srcdir}/vbe-stat']) boot.mk_fs() img.add_fs(boot, DiskHelper.EXT4) -- 2.43.0