diff options
| author | Peter Maydell | 2018-10-11 11:43:37 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-11 11:43:37 +0200 |
| commit | 75e50c80e051423a6f55a34ee4a1eec842444a5b (patch) | |
| tree | bc52115bc7254051864a725f0d44f2f53511f8e9 /tests/Makefile.include | |
| parent | s390x/tcg: always enable AFP for linux-user (diff) | |
| parent | ivshmem: Fix unplug of device "ivshmem-plain" (diff) | |
| download | qemu-75e50c80e051423a6f55a34ee4a1eec842444a5b.tar.gz qemu-75e50c80e051423a6f55a34ee4a1eec842444a5b.tar.xz qemu-75e50c80e051423a6f55a34ee4a1eec842444a5b.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into staging
Miscellaneous patches for 2018-10-10
# gpg: Signature made Wed 10 Oct 2018 07:03:10 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2018-10-10:
ivshmem: Fix unplug of device "ivshmem-plain"
libqtest: Inline g_assert_no_errno()
tests: Restore check-qdict unit test
qapi/misc.json: Remove superfluous words in CpuModelExpansionType
tests/check-qjson: fix a leak
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile.include')
| -rw-r--r-- | tests/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 7a3059bf6c..8264af64a8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -40,7 +40,7 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \ check-unit-y = tests/check-qdict$(EXESUF) gcov-files-check-qdict-y = qobject/qdict.c -check-unit-y = tests/check-block-qdict$(EXESUF) +check-unit-y += tests/check-block-qdict$(EXESUF) gcov-files-check-block-qdict-y = qobject/block-qdict.c check-unit-y += tests/test-char$(EXESUF) gcov-files-check-qdict-y = chardev/char.c |