tests: Restore check-qdict unit test

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 <[email protected]>
Message-Id: <20180926122309[email protected]>
Reviewed-by: Thomas Huth <[email protected]>

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 7a3059bf6cccc2a2a4d8a342cf94fe5b4951621e..8264af64a86821bc8de8c351a9457fab047caf93 100644 (file)
--- 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 86e9fe7dc488ade189a4131ccd1e484ae25bcafc..a1e83050661c409769f22bc5cca5b5e07fc9756e 100644 (file)
--- 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