I think this patch should also be backported to stable v2.5.1 On Tue, Apr 19, 2016 at 3:39 PM, Yang Hongyang <hongyang.y...@easystack.cn> wrote:
> When configure with --disable-guest-agent, make check will fail with: > ERROR:tests/test-qga.c:74:fixture_setup: assertion failed (error == NULL): > Failed to execute child process "/home/xx/qemu/qemu-ga" (No such file or > directory) (g-exec-error-quark, 8) > make: *** [check-tests/test-qga] Error 1 > > This check was commented out by bab47d9a75a. I think that was by > mistake, because the commit message of that commit didn't mention > this change. > > Signed-off-by: Yang Hongyang <hongyang.y...@easystack.cn> > Cc: Gerd Hoffmann <kra...@redhat.com> > Cc: Michael S. Tsirkin <m...@redhat.com> > Cc: Michael Roth <mdr...@linux.vnet.ibm.com> > Cc: Paolo Bonzini <pbonz...@redhat.com> > --- > tests/Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tests/Makefile b/tests/Makefile > index 9de9598..9194f18 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -83,7 +83,9 @@ check-unit-y += tests/test-crypto-cipher$(EXESUF) > check-unit-y += tests/test-crypto-secret$(EXESUF) > check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF) > check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF) > -#check-unit-$(CONFIG_LINUX) += tests/test-qga$(EXESUF) > +ifneq (,$(findstring qemu-ga,$(TOOLS))) > +check-unit-$(CONFIG_LINUX) += tests/test-qga$(EXESUF) > +endif > check-unit-y += tests/test-timed-average$(EXESUF) > check-unit-y += tests/test-io-task$(EXESUF) > check-unit-y += tests/test-io-channel-socket$(EXESUF) > -- > 1.8.3.1 > > > -- Thanks, Yang
