|
@@ -23,6 +23,7 @@ def test_efi_selftest(u_boot_console):
|
|
|
u_boot_console.restart_uboot()
|
|
|
|
|
|
@pytest.mark.buildconfigspec('cmd_bootefi_selftest')
|
|
|
+@pytest.mark.buildconfigspec('hush_parser')
|
|
|
@pytest.mark.buildconfigspec('of_control')
|
|
|
@pytest.mark.notbuildconfigspec('generate_acpi_table')
|
|
|
def test_efi_selftest_device_tree(u_boot_console):
|
|
@@ -36,9 +37,11 @@ def test_efi_selftest_device_tree(u_boot_console):
|
|
|
output = u_boot_console.run_command('bootefi selftest')
|
|
|
assert '\'device tree\'' in output
|
|
|
u_boot_console.run_command(cmd='setenv efi_selftest device tree')
|
|
|
- u_boot_console.run_command(cmd='setenv serial# Testing DT')
|
|
|
+ # Set serial# if it is not already set.
|
|
|
+ u_boot_console.run_command(cmd='setenv efi_test "${serial#}x"')
|
|
|
+ u_boot_console.run_command(cmd='test "${efi_test}" = x && setenv serial# 0')
|
|
|
u_boot_console.run_command(cmd='bootefi selftest ${fdtcontroladdr}', wait_for_prompt=False)
|
|
|
- m = u_boot_console.p.expect(['serial-number: Testing DT', 'U-Boot'])
|
|
|
+ m = u_boot_console.p.expect(['serial-number:', 'U-Boot'])
|
|
|
if m != 0:
|
|
|
raise Exception('serial-number missing in device tree')
|
|
|
u_boot_console.restart_uboot()
|