On 15.03.2018 12:42, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > On 03/15/2018 08:49 AM, Thomas Huth wrote: >> Commit 1454509726719e0933c800 recently broke the "-cdrom" parameter >> on a couple of boards without that we noticed it immediately. Thus >> add a test which checks that "-cdrom" can at least be used to start >> QEMU with certain machine types. >> >> Signed-off-by: Thomas Huth <th...@redhat.com> >> --- >> tests/Makefile.include | 7 +++++- >> tests/cdrom-test.c | 63 >> +++++++++++++++++++++++++++++++++++++++++++++++++- >> 2 files changed, 68 insertions(+), 2 deletions(-) >> >> diff --git a/tests/Makefile.include b/tests/Makefile.include >> index a104222..b744fea 100644 >> --- a/tests/Makefile.include >> +++ b/tests/Makefile.include >> @@ -321,8 +321,9 @@ check-qtest-microblaze-y = >> tests/boot-serial-test$(EXESUF) >> check-qtest-mips-y = tests/endianness-test$(EXESUF) >> >> check-qtest-mips64-y = tests/endianness-test$(EXESUF) >> +check-qtest-mips64-y += tests/cdrom-test$(EXESUF) >> >> -check-qtest-mips64el-y = tests/endianness-test$(EXESUF) >> +check-qtest-mips64el-y = $(check-qtest-mips64-y) >> >> check-qtest-moxie-y = tests/boot-serial-test$(EXESUF) >> >> @@ -356,6 +357,7 @@ check-qtest-ppc64-y += tests/display-vga-test$(EXESUF) >> check-qtest-ppc64-y += tests/numa-test$(EXESUF) >> check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF) >> check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF) >> +check-qtest-ppc64-y += tests/cdrom-test$(EXESUF) >> >> check-qtest-sh4-y = tests/endianness-test$(EXESUF) >> >> @@ -365,10 +367,12 @@ check-qtest-sparc-y = tests/prom-env-test$(EXESUF) >> check-qtest-sparc-y += tests/m48t59-test$(EXESUF) >> gcov-files-sparc-y = hw/timer/m48t59.c >> check-qtest-sparc-y += tests/boot-serial-test$(EXESUF) >> +check-qtest-sparc-y += tests/cdrom-test$(EXESUF) >> >> check-qtest-sparc64-y = tests/endianness-test$(EXESUF) >> check-qtest-sparc64-y += tests/prom-env-test$(EXESUF) >> check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF) >> +check-qtest-sparc64-y += tests/cdrom-test$(EXESUF) >> >> check-qtest-arm-y = tests/tmp105-test$(EXESUF) >> check-qtest-arm-y += tests/ds1338-test$(EXESUF) >> @@ -384,6 +388,7 @@ check-qtest-arm-y += tests/sdhci-test$(EXESUF) >> check-qtest-aarch64-y = tests/numa-test$(EXESUF) >> check-qtest-aarch64-y += tests/sdhci-test$(EXESUF) >> check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF) >> +check-qtest-aarch64-y += tests/cdrom-test$(EXESUF) > > Since you use g_str_equal(arch,), maybe this test can be added > regardless the arch in check-qtest-generic.
Yes, sounds like a good idea. I think the test can even be run on other architectures by using the default machine or "-M none" ... I'll give it a try ... >> ret = g_test_run(); >> > > Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Thanks! Thomas