On Wed, Aug 07, 2024 at 07:12:06PM +0200, Jerome Forissier wrote:
> Add a test to test_efi_loader.py similar to the TFTP test but for HTTP
> with the wget command.
>
> Suggested-by: Tom Rini <tr...@konsulko.com>
> Signed-off-by: Jerome Forissier <jerome.foriss...@linaro.org>
> ---
> test/py/tests/test_efi_loader.py | 52 +++++++++++++++++++++++---------
> 1 file changed, 37 insertions(+), 15 deletions(-)
>
> diff --git a/test/py/tests/test_efi_loader.py
> b/test/py/tests/test_efi_loader.py
> index 85473a9049b..64c994fdf95 100644
> --- a/test/py/tests/test_efi_loader.py
> +++ b/test/py/tests/test_efi_loader.py
> @@ -50,6 +50,8 @@ env__efi_loader_helloworld_file = {
> import pytest
> import u_boot_utils
>
> +PROTO_TFTP, PROTO_HTTP = range(0, 2)
> +
> net_set_up = False
>
> def test_efi_pre_commands(u_boot_console):
> @@ -110,10 +112,10 @@ def test_efi_setup_static(u_boot_console):
> global net_set_up
> net_set_up = True
>
> -def fetch_tftp_file(u_boot_console, env_conf):
> - """Grab an env described file via TFTP and return its address
> +def fetch_file(u_boot_console, env_conf, proto):
> + """Grab an env described file via TFTP or HTTP and return its address
>
> - A file as described by an env config <env_conf> is downloaded from the
> TFTP
> + A file as described by an env config <env_conf> is downloaded from the
> server. The address to that file is returned.
> """
> if not net_set_up:
> @@ -128,7 +130,13 @@ def fetch_tftp_file(u_boot_console, env_conf):
> addr = u_boot_utils.find_ram_base(u_boot_console)
>
> fn = f['fn']
> - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))
> + if proto == PROTO_TFTP:
> + cmd = 'tftpboot'
> + elif proto == PROTO_HTTP:
> + cmd = 'wget'
> + else:
> + assert False
> + output = u_boot_console.run_command('%s %x %s' % (cmd, addr, fn))
> expected_text = 'Bytes transferred = '
> sz = f.get('size', None)
> if sz:
> @@ -147,16 +155,8 @@ def fetch_tftp_file(u_boot_console, env_conf):
>
> return addr
>
> -@pytest.mark.buildconfigspec('of_control')
> -@pytest.mark.buildconfigspec('cmd_bootefi_hello_compile')
> -def test_efi_helloworld_net(u_boot_console):
> - """Run the helloworld.efi binary via TFTP.
> -
> - The helloworld.efi file is downloaded from the TFTP server and is
> executed
> - using the fallback device tree at $fdtcontroladdr.
> - """
> -
> - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file')
> +def do_test_efi_helloworld_net(u_boot_console, proto):
> + addr = fetch_file(u_boot_console, 'env__efi_loader_helloworld_file',
> proto)
>
> output = u_boot_console.run_command('bootefi %x' % addr)
> expected_text = 'Hello, world'
> @@ -164,6 +164,28 @@ def test_efi_helloworld_net(u_boot_console):
> expected_text = '## Application failed'
> assert expected_text not in output
>
> +@pytest.mark.buildconfigspec('of_control')
> +@pytest.mark.buildconfigspec('cmd_bootefi_hello_compile')
> +def test_efi_helloworld_net_tftp(u_boot_console):
> + """Run the helloworld.efi binary via TFTP.
> +
> + The helloworld.efi file is downloaded from the TFTP server and is
> executed
> + using the fallback device tree at $fdtcontroladdr.
> + """
> +
> + do_test_efi_helloworld_net(u_boot_console, PROTO_TFTP);
> +
> +@pytest.mark.buildconfigspec('of_control')
> +@pytest.mark.buildconfigspec('cmd_bootefi_hello_compile')
> +def test_efi_helloworld_net_http(u_boot_console):
> + """Run the helloworld.efi binary via HTTP.
> +
> + The helloworld.efi file is downloaded from the HTTP server and is
> executed
> + using the fallback device tree at $fdtcontroladdr.
> + """
> +
> + do_test_efi_helloworld_net(u_boot_console, PROTO_HTTP);
> +
> @pytest.mark.buildconfigspec('cmd_bootefi_hello')
> def test_efi_helloworld_builtin(u_boot_console):
> """Run the builtin helloworld.efi binary.
> @@ -185,7 +207,7 @@ def test_efi_grub_net(u_boot_console):
> executed.
> """
>
> - addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_grub_file')
> + addr = fetch_file(u_boot_console, 'env__efi_loader_grub_file',
> PROTO_TFTP)
>
> u_boot_console.run_command('bootefi %x' % addr, wait_for_prompt=False)Looking at this now that I've added wget to my Pi builds, erm: U-Boot> wget 200000 EFI/arm64/helloworld.efi That's not going to work. That's what works fine for a tftp server. I think the test is going to need to require some http specific configuration added (and I'll locally start firing off the python trivial http server or something, for tests). -- Tom
signature.asc
Description: PGP signature
