From: Simon Glass <simon.glass@canonical.com> Add run_efi_demo() helper that writes a startup.nsh script next to demo-app.efi in the build directory, boots QEMU with the given UEFI firmware, and checks for the expected demo output. Refactor test_ulib_demo_efi_x86() to use the shared helper and add test_ulib_demo_efi_arm64() which uses qemu-system-aarch64 with the appropriate firmware path. Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- test/py/tests/test_ulib.py | 69 ++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/test/py/tests/test_ulib.py b/test/py/tests/test_ulib.py index 1c98b8b6880..c7d79515bb9 100644 --- a/test/py/tests/test_ulib.py +++ b/test/py/tests/test_ulib.py @@ -6,6 +6,7 @@ import os import shutil import subprocess +import tempfile import pytest import utils @@ -333,34 +334,66 @@ def test_ulib_demo_riscv64(ubman): """Test the ulib demo binary under QEMU RISC-V 64.""" run_bios_demo(ubman, 'qemu-system-riscv64') -@pytest.mark.localqemu -@pytest.mark.boardspec('efi-x86_app64') -@pytest.mark.buildconfigspec("examples") -def test_ulib_demo_efi_x86(ubman): - """Test the ulib demo EFI application under QEMU x86_64 with OVMF.""" +def run_efi_demo(ubman, qemu_binary, fw_code, fw_vars, extra_qemu_args=None): + """Run a ulib demo EFI application under QEMU with UEFI firmware. + + Writes a startup.nsh script next to demo-app.efi in the build + directory, boots QEMU with the given firmware, and checks for + expected output. + + Args: + ubman (ConsoleBase): Test fixture providing build directory + etc. + qemu_binary (str): QEMU system binary name + (e.g. 'qemu-system-x86_64') + fw_code (str): Path to UEFI firmware code file + fw_vars (str): Path to UEFI firmware variables file (or None) + extra_qemu_args (list): Additional QEMU arguments + """ build = ubman.config.build_dir efi_dir = os.path.join(build, 'examples', 'ulib') demo_efi = os.path.join(efi_dir, 'demo-app.efi') assert os.path.exists(demo_efi), 'demo-app.efi not found in build directory' - assert shutil.which('qemu-system-x86_64'), 'qemu-system-x86_64 not found' - - ovmf_code = '/usr/share/OVMF/OVMF_CODE_4M.fd' - ovmf_vars = '/usr/share/OVMF/OVMF_VARS_4M.fd' - assert os.path.exists(ovmf_code), 'OVMF firmware not found' + assert shutil.which(qemu_binary), f'{qemu_binary} not found' + assert os.path.exists(fw_code), f'UEFI firmware not found: {fw_code}' with open(os.path.join(efi_dir, 'startup.nsh'), 'w', encoding='utf-8') as nsh: nsh.write('fs0:demo-app.efi\n') - # OVMF needs a writable copy of the vars file - vars_copy = os.path.join(efi_dir, 'OVMF_VARS_4M.fd') - shutil.copy(ovmf_vars, vars_copy) + cmd = [qemu_binary] - cmd = ['qemu-system-x86_64', - '-drive', f'if=pflash,format=raw,file={ovmf_code},readonly=on', - '-drive', f'if=pflash,format=raw,file={vars_copy}', - '-drive', f'file=fat:rw:{efi_dir},format=raw', - '-nographic', '-no-reboot', '-nic', 'none'] + # Set up firmware pflash drives + cmd += ['-drive', f'if=pflash,format=raw,file={fw_code},readonly=on'] + if fw_vars: + vars_copy = os.path.join(efi_dir, 'vars.fd') + shutil.copy(fw_vars, vars_copy) + cmd += ['-drive', f'if=pflash,format=raw,file={vars_copy}'] + + if extra_qemu_args: + cmd += extra_qemu_args + + # FAT drive with EFI binary and startup script + cmd += ['-drive', f'file=fat:rw:{efi_dir},format=raw', + '-nographic', '-no-reboot', '-nic', 'none'] out = run_qemu_demo(cmd, timeout=15) assert_demo_output(out) + +@pytest.mark.localqemu +@pytest.mark.boardspec('efi-x86_app64') +@pytest.mark.buildconfigspec("examples") +def test_ulib_demo_efi_x86(ubman): + """Test the ulib demo EFI application under QEMU x86_64 with OVMF.""" + run_efi_demo(ubman, 'qemu-system-x86_64', + '/usr/share/OVMF/OVMF_CODE_4M.fd', + '/usr/share/OVMF/OVMF_VARS_4M.fd') + +@pytest.mark.localqemu +@pytest.mark.boardspec('efi-arm_app64') +@pytest.mark.buildconfigspec("examples") +def test_ulib_demo_efi_arm64(ubman): + """Test the ulib demo EFI application under QEMU aarch64 with UEFI.""" + run_efi_demo(ubman, 'qemu-system-aarch64', + '/usr/share/qemu-efi-aarch64/QEMU_EFI.fd', None, + ['--machine', 'virt', '-cpu', 'max']) -- 2.43.0