Re: [PATCH] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs

[Daniel P . Berrangé]

On Thu, Sep 23, 2021 at 04:15:55AM -0400, Paolo Bonzini wrote:
> Skip the test if bzip2 is not available, and run it after they are
> uncompressed.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  pc-bios/meson.build     | 3 ++-
>  tests/qtest/meson.build | 6 +++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/pc-bios/meson.build b/pc-bios/meson.build
> index f2b32598af..975565198e 100644
> --- a/pc-bios/meson.build
> +++ b/pc-bios/meson.build
> @@ -10,8 +10,9 @@ if install_edk2_blobs
>      'edk2-x86_64-secure-code.fd',
>    ]
>  
> +  roms = []
>    foreach f : fds
> -    custom_target(f,
> +    roms += custom_target(f,
>                    build_by_default: have_system,
>                    output: f,
>                    input: '@0@.bz2'.format(f),
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index e1f4df3df8..6d8100c9de 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -68,12 +68,12 @@ qtests_i386 = \
>    (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) 
> +              \
>    (config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ? 
> ['fuzz-e1000e-test'] : []) +   \
>    (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) +  
>                \
> +  (install_edk2_blobs ? ['bios-tables-test'] : []) +                         
>                \
>    qtests_pci +                                                               
>                \
>    ['fdc-test',
>     'ide-test',
>     'hd-geo-test',
>     'boot-order-test',
> -   'bios-tables-test',
>     'rtc-test',
>     'i440fx-test',
>     'fw_cfg-test',
> @@ -180,7 +180,7 @@ qtests_arm = \
>  
>  # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test 
> unconditional
>  qtests_aarch64 = \
> -  (cpu != 'arm' ? ['bios-tables-test'] : []) +                               
>                    \
> +  (cpu != 'arm' and install_edk2_blobs ? ['bios-tables-test'] : []) +        
>                    \
>    (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? 
> ['tpm-tis-device-test'] : []) +        \
>    (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? 
> ['tpm-tis-device-swtpm-test'] : []) +  \
>    ['arm-cpu-features',
> @@ -269,7 +269,7 @@ foreach dir : target_dirs
>    qtest_emulator = emulators['qemu-system-' + target_base]
>    target_qtests = get_variable('qtests_' + target_base, []) + qtests_generic
>  
> -  test_deps = []
> +  test_deps = roms

Shouldn't this be

  if install_edk2_blobs
     test_deps += roms
  endif


>    qtest_env = environment()
>    if have_tools
>      qtest_env.set('QTEST_QEMU_IMG', './qemu-img')

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|