Commit 4113b053 authored Apr 20, 2016 by Peter Maydell

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-04-19-tag' into staging



qemu-ga patch queue for 2.6

* fixes inadvertant change that unconditionally disables qemu-ga unit test
* fixes make check failures when building with --disable-guest-agent that
  were present visible before the unit test was inadvertantly disabled.

# gpg: Signature made Tue 19 Apr 2016 23:30:09 BST using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"

* remotes/mdroth/tags/qga-pull-2016-04-19-tag:
  qemu-ga: do not run qga test when guest agent disabled

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents fe98b18b fb91f30b

tests/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -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)