| Message ID | 20210305145941.32020-33-cfontana@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | arm cleanup experiment for kvm-only build | expand |
On 3/5/21 3:59 PM, Claudio Fontana wrote: > Signed-off-by: Claudio Fontana <cfontana@suse.de> > --- > tests/meson.build | 6 +++--- > tests/qtest/meson.build | 8 +++----- > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/tests/meson.build b/tests/meson.build > index 7d7da6a636..7b4fa2778c 100644 > --- a/tests/meson.build > +++ b/tests/meson.build > @@ -159,9 +159,9 @@ if have_block > 'test-crypto-afsplit': [io], > 'test-crypto-block': [io], > } > - if 'CONFIG_GNUTLS' in config_host and \ > - 'CONFIG_TASN1' in config_host and \ > - 'CONFIG_POSIX' in config_host > + if 'CNFIG_GNUTLS' in config_host and \ > + 'CNFIG_TASN1' in config_host and \ > + 'CNFIG_POSIX' in config_host > tests += { > 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', > tasn1, crypto, gnutls], Disabling these is not necessary anymore, they work fine now. > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index ba6ecaed32..6077e0748e 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -6,12 +6,12 @@ endif > > qtests_generic = [ > 'cdrom-test', > - 'device-introspect-test', > +# 'device-introspect-test', > 'machine-none-test', > 'qmp-test', > 'qmp-cmd-test', > - 'qom-test', > - 'test-hmp', > +# 'qom-test', > +# 'test-hmp', > 'qos-test', > ] > if config_host.has_key('CONFIG_MODULES') > @@ -158,8 +158,6 @@ 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'] : []) + \ > - (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', > 'numa-test', > 'boot-serial-test', >
diff --git a/tests/meson.build b/tests/meson.build index 7d7da6a636..7b4fa2778c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -159,9 +159,9 @@ if have_block 'test-crypto-afsplit': [io], 'test-crypto-block': [io], } - if 'CONFIG_GNUTLS' in config_host and \ - 'CONFIG_TASN1' in config_host and \ - 'CONFIG_POSIX' in config_host + if 'CNFIG_GNUTLS' in config_host and \ + 'CNFIG_TASN1' in config_host and \ + 'CNFIG_POSIX' in config_host tests += { 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', tasn1, crypto, gnutls], diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index ba6ecaed32..6077e0748e 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -6,12 +6,12 @@ endif qtests_generic = [ 'cdrom-test', - 'device-introspect-test', +# 'device-introspect-test', 'machine-none-test', 'qmp-test', 'qmp-cmd-test', - 'qom-test', - 'test-hmp', +# 'qom-test', +# 'test-hmp', 'qos-test', ] if config_host.has_key('CONFIG_MODULES') @@ -158,8 +158,6 @@ 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'] : []) + \ - (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', 'numa-test', 'boot-serial-test',
Signed-off-by: Claudio Fontana <cfontana@suse.de> --- tests/meson.build | 6 +++--- tests/qtest/meson.build | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-)