From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs
Date: Thu, 23 Sep 2021 12:00:16 +0200 [thread overview]
Message-ID: <aac1894b-e515-cbc7-5b51-aaddc6fc3de4@amsat.org> (raw)
In-Reply-To: <YUw5Pglv2lcS2Nz6@redhat.com>
On 9/23/21 10:22, Daniel P. Berrangé wrote:
> 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
See also "blobs: Only install required (system emulation) files":
https://lore.kernel.org/qemu-devel/20210323155132.238193-1-f4bug@amsat.org/
next prev parent reply other threads:[~2021-09-23 10:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 8:15 [PATCH] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs Paolo Bonzini
2021-09-23 8:22 ` Daniel P. Berrangé
2021-09-23 10:00 ` Philippe Mathieu-Daudé [this message]
2021-09-23 10:32 ` Paolo Bonzini
2021-09-23 10:44 ` Peter Maydell
2021-09-23 11:40 ` Paolo Bonzini
2021-09-23 10:29 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aac1894b-e515-cbc7-5b51-aaddc6fc3de4@amsat.org \
--to=f4bug@amsat.org \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).