Commit 0bcc8e5bd8d accidentally dropped check-qdict from the list of
unit tests (again, see commit 4429532b48a).  Put it back, and fix up
the test.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180926122309.30631-1-armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include | 2 +-
 tests/check-qdict.c    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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
diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 86e9fe7dc4..a1e8305066 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -12,6 +12,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qnum.h"
+#include "qapi/qmp/qstring.h"
 
 /*
  * Public Interface test-cases
-- 
2.17.1

On 10/10/18 1:11 AM, Markus Armbruster wrote:
> Commit 0bcc8e5bd8d accidentally dropped check-qdict from the list of
> unit tests (again, see commit 4429532b48a).  Put it back, and fix up
> the test.

Since this seems to be a recurring problem...

> +++ b/tests/Makefile.include
> @@ -40,7 +40,7 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
>   
>   check-unit-y = tests/check-qdict$(EXESUF)

How about a followup patch that does:

-   check-unit-y = tests/check-qdict$(EXESUF)
+   check-unit-y =
+   check-unit-y += tests/check-qdict$(EXESUF)


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

On 10/10/2018 18:43, Eric Blake wrote:
> On 10/10/18 1:11 AM, Markus Armbruster wrote:
>> Commit 0bcc8e5bd8d accidentally dropped check-qdict from the list of
>> unit tests (again, see commit 4429532b48a).  Put it back, and fix up
>> the test.
> 
> Since this seems to be a recurring problem...
> 
>> +++ b/tests/Makefile.include
>> @@ -40,7 +40,7 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
>>     check-unit-y = tests/check-qdict$(EXESUF)
> 
> How about a followup patch that does:
> 
> -   check-unit-y = tests/check-qdict$(EXESUF)
> +   check-unit-y =
> +   check-unit-y += tests/check-qdict$(EXESUF)
> 

Yes, clever :)