| Message ID | 20200915134412.5jmvbs7eqcv5sugc@kamzik.brq.redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | couple meson issues | expand |
On 15/09/20 15:44, Andrew Jones wrote: > Hi Paolo, > > I noticed that 'make check-qtest-aarch64' no longer runs the > arm-cpu-feature test. I simply did > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 874b5be62be2..db169a53b530 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -146,7 +146,8 @@ 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'] : []) + \ > - ['numa-test', > + ['arm-cpu-features', > + 'numa-test', > 'boot-serial-test', > 'migration-test'] Yes, either that or "qtests_aarch64 = qtests_arm + <whatever is there now>". > to get it to run, but don't know if it should be done that way. Were you > planning to inherit tests for aarch64 from arm or something instead? > > Also, I was surprised to not see something like "KVM supported" when I did > configure on an AArch64 machine with KVM. That's a "TODO": # TODO: add back KVM/HAX/HVF/WHPX/TCG #summary_info += {'KVM support': have_kvm} #summary_info += {'HAX support': have_hax} #summary_info += {'HVF support': have_hvf} #summary_info += {'WHPX support': have_whpx} #summary_info += {'TCG support': have_tcg} which I had honestly completely forgotten about. Accelerator support is per-target so it must be computed in the "foreach target : target_dirs" loop around line 550 of meson.build. But I might even have the patch already, since it was meant to be temporary and fixed as soon as that loop was added to meson in the very first series. Paolo
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 874b5be62be2..db169a53b530 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -146,7 +146,8 @@ 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'] : []) + \ - ['numa-test', + ['arm-cpu-features', + 'numa-test', 'boot-serial-test', 'migration-test']