From 2a5c67f50a438b266dc72c9401e578ec8b81db16 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 20 Oct 2022 18:23:17 -0600 Subject: vbe: Use a manual test Use a manual test for the VBE test, so we can make the pytest and the C unit test work together properly. Signed-off-by: Simon Glass --- test/py/tests/test_vbe.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'test/py/tests/test_vbe.py') diff --git a/test/py/tests/test_vbe.py b/test/py/tests/test_vbe.py index 559c2918868..50b6c1cd911 100644 --- a/test/py/tests/test_vbe.py +++ b/test/py/tests/test_vbe.py @@ -85,7 +85,7 @@ bootm loados bootm prep fdt addr fdt print -ut bootstd vbe_test_fixup +ut bootstd -f vbe_test_fixup_norun ''' @pytest.mark.boardspec('sandbox_flattree') @@ -117,7 +117,4 @@ def test_vbe(u_boot_console): with cons.log.section('Kernel load'): output = cons.run_command_list(cmd.splitlines()) - # This is a little wonky since there are two tests running in CI. The final - # one is the 'ut bootstd' command above - failures = [line for line in output if 'Failures' in line] - assert len(failures) >= 1 and 'Failures: 0' in failures[-1] + assert 'Failures: 0' in output[-1] -- cgit v1.2.3