| Message ID | 20201005105442.2093105-4-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qom: Fix missing interface in qemu-storage-daemon | expand |
On 05/10/20 12:54, Philippe Mathieu-Daudé wrote: > This test fails on top of commit 69699f3055 > ("crypto/tls-cipher-suites: Produce fw_cfg consumable blob") > because the TYPE_FW_CFG_DATA_GENERATOR_INTERFACE registered > in hw/nvram/fw_cfg.c is not linked into qemu-storage-daemon: > > $ make check-block > Generating qemu-version.h with a meson_exe.py custom command > qemu-storage-daemon > tests/qemu-storage-daemon.sh: line 10: 2089929 Aborted (core dumped) > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/Makefile.include | 3 +++ > tests/qemu-storage-daemon.sh | 10 ++++++++++ > 2 files changed, 13 insertions(+) > create mode 100755 tests/qemu-storage-daemon.sh > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index d257777560..be12581c77 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -142,7 +142,10 @@ endif > check: check-block > check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ > qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ > + storage-daemon/qemu-storage-daemon \ > $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) > + $(call quiet-command, \ > + $(SRC_PATH)/tests/qemu-storage-daemon.sh, "qemu-storage-daemon") > @$< > endif > > diff --git a/tests/qemu-storage-daemon.sh b/tests/qemu-storage-daemon.sh > new file mode 100755 > index 0000000000..9fd4c73400 > --- /dev/null > +++ b/tests/qemu-storage-daemon.sh > @@ -0,0 +1,10 @@ > +#!/bin/sh > + > +# Test all QOM dependencies are resolved > +storage-daemon/qemu-storage-daemon \ > + --chardev stdio,id=qmp0 --monitor qmp0 \ > + > /dev/null << 'EOF' > +{"execute": "qmp_capabilities"} > +{"execute": "qom-list-types"} > +{"execute": "quit"} > +EOF I think you should either do this as a qemu-iotests testcase, or use libqtest. Paolo
diff --git a/tests/Makefile.include b/tests/Makefile.include index d257777560..be12581c77 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -142,7 +142,10 @@ endif check: check-block check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ + storage-daemon/qemu-storage-daemon \ $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) + $(call quiet-command, \ + $(SRC_PATH)/tests/qemu-storage-daemon.sh, "qemu-storage-daemon") @$< endif diff --git a/tests/qemu-storage-daemon.sh b/tests/qemu-storage-daemon.sh new file mode 100755 index 0000000000..9fd4c73400 --- /dev/null +++ b/tests/qemu-storage-daemon.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# Test all QOM dependencies are resolved +storage-daemon/qemu-storage-daemon \ + --chardev stdio,id=qmp0 --monitor qmp0 \ + > /dev/null << 'EOF' +{"execute": "qmp_capabilities"} +{"execute": "qom-list-types"} +{"execute": "quit"} +EOF
This test fails on top of commit 69699f3055 ("crypto/tls-cipher-suites: Produce fw_cfg consumable blob") because the TYPE_FW_CFG_DATA_GENERATOR_INTERFACE registered in hw/nvram/fw_cfg.c is not linked into qemu-storage-daemon: $ make check-block Generating qemu-version.h with a meson_exe.py custom command qemu-storage-daemon tests/qemu-storage-daemon.sh: line 10: 2089929 Aborted (core dumped) Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/Makefile.include | 3 +++ tests/qemu-storage-daemon.sh | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100755 tests/qemu-storage-daemon.sh