Richard Henderson <richard.hender...@linaro.org> writes:
> On 6/4/21 8:53 AM, Alex Bennée wrote: >> The assumption that the qemu-system-aarch64 image can run all 32 bit >> machines is about to be broken... > > Um, what? Really what we want is to probe the -M (machines) that a binary supports rather than just barfing the test because we've built a QEMU that doesn't support all the random 32 bit machines. > r~ > > > > and besides it's not likely this is >> improving out coverage by much. Test the "virt" machine for both arm >> and aarch64 as it can be used by either architecture. I think this point still stands though, I don't think we get much from running the cdrom test with realview et all on qemu-system-aarch64. >> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> >> --- >> tests/qtest/cdrom-test.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c >> index 5af944a5fb..1e74354624 100644 >> --- a/tests/qtest/cdrom-test.c >> +++ b/tests/qtest/cdrom-test.c >> @@ -220,13 +220,16 @@ int main(int argc, char **argv) >> "magnum", "malta", "pica61", NULL >> }; >> add_cdrom_param_tests(mips64machines); >> - } else if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) { >> + } else if (g_str_equal(arch, "arm")) { >> const char *armmachines[] = { >> "realview-eb", "realview-eb-mpcore", "realview-pb-a8", >> "realview-pbx-a9", "versatileab", "versatilepb", >> "vexpress-a15", >> "vexpress-a9", "virt", NULL >> }; >> add_cdrom_param_tests(armmachines); >> + } else if (g_str_equal(arch, "aarch64")) { >> + const char *aarch64machines[] = { "virt", NULL }; >> + add_cdrom_param_tests(aarch64machines); >> } else { >> const char *nonemachine[] = { "none", NULL }; >> add_cdrom_param_tests(nonemachine); >> -- Alex Bennée