lib: uuid: alignment error in gen_rand_uuid()

[oweals/u-boot.git] / test / py / tests / test_efi_selftest.py

diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py
index e0833ffe22ca5413b0e434f1ff01e544b1260e04..d5430f9c127525919c4ea3a2768ccc4cdee35f7e 100644 (file)
--- a/test/py/tests/test_efi_selftest.py
+++ b/test/py/tests/test_efi_selftest.py
@@ -8,23 +8,22 @@ import u_boot_utils
 
 @pytest.mark.buildconfigspec('cmd_bootefi_selftest')
 def test_efi_selftest(u_boot_console):
-       """
-       Run bootefi selftest
-       """
+       """Test the UEFI implementation
+
+       :param u_boot_console: U-Boot console
 
+       This function executes all selftests that are not marked as on request.
+       """
        u_boot_console.run_command(cmd='setenv efi_selftest')
        u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False)
        m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key'])
        if m != 0:
                raise Exception('Failures occurred during the EFI selftest')
-       u_boot_console.run_command(cmd='', wait_for_echo=False, wait_for_prompt=False);
-       m = u_boot_console.p.expect(['resetting', 'U-Boot'])
-       if m != 0:
-               raise Exception('Reset failed during the EFI selftest')
        u_boot_console.restart_uboot();
 
 @pytest.mark.buildconfigspec('cmd_bootefi_selftest')
 @pytest.mark.buildconfigspec('of_control')
+@pytest.mark.notbuildconfigspec('generate_acpi_table')
 def test_efi_selftest_device_tree(u_boot_console):
        u_boot_console.run_command(cmd='setenv efi_selftest list')
        output = u_boot_console.run_command('bootefi selftest')
@@ -34,7 +33,7 @@ def test_efi_selftest_device_tree(u_boot_console):
        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'])
        if m != 0:
-               raise Exception('Reset failed in \'device tree\' test')
+               raise Exception('serial-number missing in device tree')
        u_boot_console.restart_uboot();
 
 @pytest.mark.buildconfigspec('cmd_bootefi_selftest')
@@ -139,7 +138,7 @@ def test_efi_selftest_text_input_ex(u_boot_console):
        u_boot_console.run_command(cmd=chr(4), wait_for_echo=False,
                                   send_nl=False, wait_for_prompt=False)
        m = u_boot_console.p.expect(
-               ['Unicode char 4 \(unknown\), scan code 0 \(CTRL\+Null\)'])
+               ['Unicode char 100 \\(\'d\'\\), scan code 0 \\(CTRL\\+Null\\)'])
        if m != 0:
                raise Exception('EOT failed in \'text input\' test')
        u_boot_console.drain_console()