On 04/01/2016 05:16 AM, marcandre.lur...@redhat.com wrote: > From: Marc-André Lureau <marcandre.lur...@redhat.com> > > Do not overwrite x86-64 tests, re-enable vhost-user-test. > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > tests/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
This one should go in 2.6. Reviewed-by: Eric Blake <ebl...@redhat.com> > > diff --git a/tests/Makefile b/tests/Makefile > index 45b9048..9293d49 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -222,7 +222,7 @@ endif > check-qtest-i386-y += tests/test-netfilter$(EXESUF) > check-qtest-i386-y += tests/test-filter-mirror$(EXESUF) > check-qtest-i386-y += tests/test-filter-redirector$(EXESUF) > -check-qtest-x86_64-y = $(check-qtest-i386-y) > +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)) > check-qtest-mips-y = tests/endianness-test$(EXESUF) > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
