| Message ID | 20230119135424.5417-6-farosas@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Allow CONFIG_TCG=n builds | expand |
On 1/19/23 03:54, Fabiano Rosas wrote: > These tests set -accel tcg, so restrict them to when TCG is present. > > Signed-off-by: Fabiano Rosas<farosas@suse.de> > --- > tests/qtest/meson.build | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) Acked-by: Richard Henderson <richard.henderson@linaro.org> r~
On 19/01/2023 14.54, Fabiano Rosas wrote: > These tests set -accel tcg, so restrict them to when TCG is present. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > tests/qtest/meson.build | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 1af63f8bd2..9dd5c2de6e 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -204,8 +204,8 @@ qtests_arm = \ > # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional > qtests_aarch64 = \ > (cpu != 'arm' and unpack_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'] : []) + \ > + (config_all_devices.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ > + ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ > (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ > (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ > ['arm-cpu-features', > @@ -295,11 +295,15 @@ qtests = { > 'tpm-crb-test': [io, tpmemu_files], > 'tpm-tis-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], > 'tpm-tis-test': [io, tpmemu_files, 'tpm-tis-util.c'], > - 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], > - 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], > 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'), > } > > +if config_all_devices.has_key('CONFIG_TCG') > + qtests += { 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], > + 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], } > +endif > + > + > gvnc = dependency('gvnc-1.0', required: false) > if gvnc.found() > qtests += {'vnc-display-test': [gvnc]} Reviewed-by: Thomas Huth <thuth@redhat.com>
On 19/01/2023 14.54, Fabiano Rosas wrote: > These tests set -accel tcg, so restrict them to when TCG is present. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > tests/qtest/meson.build | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 1af63f8bd2..9dd5c2de6e 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -204,8 +204,8 @@ qtests_arm = \ > # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional > qtests_aarch64 = \ > (cpu != 'arm' and unpack_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'] : []) + \ > + (config_all_devices.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ > + ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ > (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ > (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ > ['arm-cpu-features', > @@ -295,11 +295,15 @@ qtests = { > 'tpm-crb-test': [io, tpmemu_files], > 'tpm-tis-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], > 'tpm-tis-test': [io, tpmemu_files, 'tpm-tis-util.c'], > - 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], > - 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], > 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'), > } > > +if config_all_devices.has_key('CONFIG_TCG') > + qtests += { 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], > + 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], } > +endif Hmmm, I think the second hunk is maybe not necessary - it's just for declaring the dependencies, but not for adding the tests to the set that is run later. Thomas
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 1af63f8bd2..9dd5c2de6e 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -204,8 +204,8 @@ qtests_arm = \ # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional qtests_aarch64 = \ (cpu != 'arm' and unpack_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'] : []) + \ + (config_all_devices.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ + ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ ['arm-cpu-features', @@ -295,11 +295,15 @@ qtests = { 'tpm-crb-test': [io, tpmemu_files], 'tpm-tis-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], 'tpm-tis-test': [io, tpmemu_files, 'tpm-tis-util.c'], - 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], - 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], 'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'), } +if config_all_devices.has_key('CONFIG_TCG') + qtests += { 'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], + 'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'], } +endif + + gvnc = dependency('gvnc-1.0', required: false) if gvnc.found() qtests += {'vnc-display-test': [gvnc]}
These tests set -accel tcg, so restrict them to when TCG is present. Signed-off-by: Fabiano Rosas <farosas@suse.de> --- tests/qtest/meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)