| Message ID | 20151006021426-mutt-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 6 October 2015 at 00:17, Michael S. Tsirkin <mst@redhat.com> wrote: > On Mon, Oct 05, 2015 at 11:39:39PM +0100, Peter Maydell wrote: >> On 2 October 2015 at 14:45, Michael S. Tsirkin <mst@redhat.com> wrote: >> > Most people don't run make check by default, so they skip vhost-user >> > unit tests. Solve this by using tmpfs instead, unless hugetlbfs is >> > specified (using an environment variable). >> > >> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> Unfortunately I didn't notice before applying the pull, but this >> is breaking 'make check' on AArch64 host for me: >> >> TEST: tests/vhost-user-test... (pid=20205) >> Warning: path not on HugeTLBFS: /tmp/vhost-test-gRpbwl >> qemu-system-i386: -netdev vhost-user,id=net0,chardev=chr0,vhostforce: >> vhost-net support is not compiled in >> qemu-system-i386: -netdev vhost-user,id=net0,chardev=chr0,vhostforce: >> failed to init vhost_net for queue 0 >> >> Broken pipe >> FAIL: tests/vhost-user-test >> >> Probably reproducible on x86 if you configure with --disable-vhost-net, >> though I haven't tried that. >> >> Perhaps tests/vhost-user-test should be set up >> in tests/Makefile using >> check-qtest-i386-$(CONFIG_VHOST_USER) rather >> than CONFIG_LINUX ? >> >> I'd appreciate a quick fix, because this machine is in my set >> of systems I test all pullreqs on now... >> >> thanks >> -- PMM > > I think you are right, but just to be on the safe side, let's test > both for now. > > If this helps you, pls feel free to apply. > > I will look at cleaning this up later. Yes, this fixes the test run on aarch64; I'll apply it to master. -- PMM
On 6 October 2015 at 09:41, Peter Maydell <peter.maydell@linaro.org> wrote: > On 6 October 2015 at 00:17, Michael S. Tsirkin <mst@redhat.com> wrote: >> If this helps you, pls feel free to apply. >> >> I will look at cleaning this up later. > > Yes, this fixes the test run on aarch64; I'll apply it to > master. Now applied; thanks. -- PMM
Hi On Tue, Oct 6, 2015 at 1:17 AM, Michael S. Tsirkin <mst@redhat.com> wrote: > On Mon, Oct 05, 2015 at 11:39:39PM +0100, Peter Maydell wrote: >> On 2 October 2015 at 14:45, Michael S. Tsirkin <mst@redhat.com> wrote: >> > Most people don't run make check by default, so they skip vhost-user >> > unit tests. Solve this by using tmpfs instead, unless hugetlbfs is >> > specified (using an environment variable). >> > >> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> Unfortunately I didn't notice before applying the pull, but this >> is breaking 'make check' on AArch64 host for me: >> >> TEST: tests/vhost-user-test... (pid=20205) >> Warning: path not on HugeTLBFS: /tmp/vhost-test-gRpbwl >> qemu-system-i386: -netdev vhost-user,id=net0,chardev=chr0,vhostforce: >> vhost-net support is not compiled in >> qemu-system-i386: -netdev vhost-user,id=net0,chardev=chr0,vhostforce: >> failed to init vhost_net for queue 0 >> >> Broken pipe >> FAIL: tests/vhost-user-test >> >> Probably reproducible on x86 if you configure with --disable-vhost-net, >> though I haven't tried that. >> >> Perhaps tests/vhost-user-test should be set up >> in tests/Makefile using >> check-qtest-i386-$(CONFIG_VHOST_USER) rather >> than CONFIG_LINUX ? >> >> I'd appreciate a quick fix, because this machine is in my set >> of systems I test all pullreqs on now... >> >> thanks >> -- PMM > > I think you are right, but just to be on the safe side, let's test > both for now. > > If this helps you, pls feel free to apply. > > I will look at cleaning this up later. > > --> > > tests: vhost-user: disable unless CONFIG_VHOST_NET > > vhost-user depends on vhost-net. We should probably fix that. > For now, let's disable the test otherwise. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Unfortunately, this commit disables vhost-user-test all together, because CONFIG_VHOST_NET is a target config. > --- > > diff --git a/tests/Makefile b/tests/Makefile > index 4063639..e6474ba 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -188,7 +188,9 @@ gcov-files-i386-y += hw/usb/hcd-xhci.c > check-qtest-i386-y += tests/pc-cpu-test$(EXESUF) > check-qtest-i386-y += tests/q35-test$(EXESUF) > gcov-files-i386-y += hw/pci-host/q35.c > +ifeq ($(CONFIG_VHOST_NET),y) > check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF) > +endif > check-qtest-x86_64-y = $(check-qtest-i386-y) > gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c > gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) > >
diff --git a/tests/Makefile b/tests/Makefile index 4063639..e6474ba 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -188,7 +188,9 @@ gcov-files-i386-y += hw/usb/hcd-xhci.c check-qtest-i386-y += tests/pc-cpu-test$(EXESUF) check-qtest-i386-y += tests/q35-test$(EXESUF) gcov-files-i386-y += hw/pci-host/q35.c +ifeq ($(CONFIG_VHOST_NET),y) check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF) +endif check-qtest-x86_64-y = $(check-qtest-i386-y) gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))