From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJpJd-0007cv-SD for qemu-devel@nongnu.org; Thu, 04 Oct 2012 13:34:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJpJb-00013J-L1 for qemu-devel@nongnu.org; Thu, 04 Oct 2012 13:34:29 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:46731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJpJb-0000hT-Ct for qemu-devel@nongnu.org; Thu, 04 Oct 2012 13:34:27 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so707994oag.4 for ; Thu, 04 Oct 2012 10:34:27 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Thu, 4 Oct 2012 12:33:41 -0500 Message-Id: <1349372021-31212-23-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1349372021-31212-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1349372021-31212-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 22/22] qidl: unit tests and build infrastructure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, eblake@redhat.com Signed-off-by: Michael Roth --- Makefile | 2 + rules.mak | 20 ++++- tests/Makefile | 8 +- tests/test-qidl-included.h | 31 ++++++++ tests/test-qidl-linked.c | 93 ++++++++++++++++++++++ tests/test-qidl-linked.h | 18 +++++ tests/test-qidl.c | 187 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 356 insertions(+), 3 deletions(-) create mode 100644 tests/test-qidl-included.h create mode 100644 tests/test-qidl-linked.c create mode 100644 tests/test-qidl-linked.h create mode 100644 tests/test-qidl.c diff --git a/Makefile b/Makefile index b82fc49..8354c07 100644 --- a/Makefile +++ b/Makefile @@ -236,6 +236,7 @@ clean: if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ rm -f $$d/qemu-options.def; \ done + find -depth -name qidl-generated -type d -exec rm -rf {} \; VERSION ?= $(shell cat VERSION) @@ -405,6 +406,7 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \ # rebuilt before other object files Makefile: $(GENERATED_HEADERS) + # Include automatically generated dependency files # Dependencies in Makefile.objs files come from our recursive subdir rules -include $(wildcard *.d tests/*.d) diff --git a/rules.mak b/rules.mak index 1b173aa..f6a0201 100644 --- a/rules.mak +++ b/rules.mak @@ -15,7 +15,25 @@ MAKEFLAGS += -rR QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d %.o: %.c - $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") + +%.qidl.c: %.c $(SRC_PATH)/qidl.h $(addprefix $(SRC_PATH)/scripts/,lexer.py qidl.py qidl_parser.py qapi.py qapi_visit.py) + $(call rm -f $(*D)/qidl-generated/$(*F).qidl.c) + $(if $(strip $(shell grep "QIDL_ENABLE()" $< 1>/dev/null && echo "true")), \ + $(call quiet-command, \ + $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(CFLAGS) -E -c -DQIDL_GEN $< | \ + $(PYTHON) $(SRC_PATH)/scripts/qidl.py \ + --output-filepath=$(*D)/qidl-generated/$(*F).qidl.c || [ "$$?" -eq 2 ], \ + "qidl PP $(*D)/$(*F).c"),) + +%.o: %.c %.qidl.c + $(if $(strip $(shell test -f $(*D)/qidl-generated/$(*F).qidl.c && echo "true")), \ + $(call quiet-command, \ + $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c \ + -DQIDL_ENABLED -include $< -o $@ $(*D)/qidl-generated/$(*F).qidl.c, \ + "qidl CC $@"), \ + $(call quiet-command, \ + $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c \ + -o $@ $<," CC $@")) ifeq ($(LIBTOOL),) %.lo: %.c diff --git a/tests/Makefile b/tests/Makefile index e10aaed..fe2d025 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -15,6 +15,7 @@ check-unit-y += tests/test-string-output-visitor$(EXESUF) check-unit-y += tests/test-coroutine$(EXESUF) check-unit-y += tests/test-visitor-serialization$(EXESUF) check-unit-y += tests/test-iov$(EXESUF) +check-unit-y += tests/test-qidl$(EXESUF) check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh @@ -34,11 +35,12 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \ tests/test-coroutine.o tests/test-string-output-visitor.o \ tests/test-string-input-visitor.o tests/test-qmp-output-visitor.o \ tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \ - tests/test-qmp-commands.o tests/test-visitor-serialization.o + tests/test-qmp-commands.o tests/test-visitor-serialization.o \ + tests/test-qidl.o test-qapi-obj-y = $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o -test-qapi-obj-y += module.o +test-qapi-obj-y += module.o $(qom-obj-y) $(test-obj-y): QEMU_INCLUDES += -Itests @@ -84,6 +86,8 @@ check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET) qtest-obj-y = tests/libqtest.o $(oslib-obj-y) $(tools-obj-y) $(check-qtest-y): $(qtest-obj-y) +tests/test-qidl$(EXESUF): tests/test-qidl.o tests/test-qidl-linked.o $(test-qapi-obj-y) qapi/misc-qapi-visit.o + .PHONY: check-help check-help: @echo "Regression testing targets:" diff --git a/tests/test-qidl-included.h b/tests/test-qidl-included.h new file mode 100644 index 0000000..535a153 --- /dev/null +++ b/tests/test-qidl-included.h @@ -0,0 +1,31 @@ +/* + * Unit-tests for QIDL-generated visitors/code + * + * Copyright IBM, Corp. 2012 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef TEST_QIDL_INCLUDED_H +#define TEST_QIDL_INCLUDED_H + +#include "qidl.h" + +typedef struct TestStructIncluded TestStructIncluded; + +QIDL_DECLARE(TestStructIncluded) { + int32_t q_immutable a; + int32_t b; + uint32_t q_immutable c; + uint32_t d; + uint64_t q_immutable e; + uint64_t q_property("f", 42) f; + char q_property("g") *g; + char q_property("h") q_immutable *h; +}; + +#endif diff --git a/tests/test-qidl-linked.c b/tests/test-qidl-linked.c new file mode 100644 index 0000000..641e561 --- /dev/null +++ b/tests/test-qidl-linked.c @@ -0,0 +1,93 @@ +/* + * Unit-tests for QIDL-generated visitors/code + * + * Copyright IBM, Corp. 2012 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qidl.h" +#include "test-qidl-linked.h" +#include "hw/qdev-properties.h" +#include "qapi/qmp-input-visitor.h" +#include "qapi/qmp-output-visitor.h" +#include "qapi/qapi-dealloc-visitor.h" + +QIDL_ENABLE() + +typedef struct TestStructLinked TestStructLinked; + +QIDL_DECLARE(TestStructLinked) { + int32_t q_immutable a; + int32_t b; + uint32_t q_immutable c; + uint32_t d; + uint64_t q_immutable e; + uint64_t q_property("f", 42) f; + char q_property("g") *g; + char q_property("h") q_immutable *h; +}; + +/* exercise generated code from annotations in objects we link against */ +void test_linked_object_annotations(gconstpointer opaque) +{ + TestStructLinked *s1, *s2 = NULL; + Property *props; + QmpInputVisitor *qiv; + QmpOutputVisitor *qov; + QObject *s1_obj; + Error *err = NULL; + + s1 = g_malloc0(sizeof(TestStructLinked)); + s1->a = 42; + s1->b = INT32_MAX; + s1->c = 43; + s1->d = UINT32_MAX; + s1->e = 44; + s1->f = UINT64_MAX; + s1->g = g_strdup("test string g"); + s1->h = g_strdup("test string h"); + + qov = qmp_output_visitor_new(); + QIDL_VISIT_TYPE(TestStructLinked, qmp_output_get_visitor(qov), &s1, NULL, &err); + g_assert(err == NULL); + + s1_obj = qmp_output_get_qobject(qov); + qiv = qmp_input_visitor_new(s1_obj); + + qobject_decref(s1_obj); + qmp_output_visitor_cleanup(qov); + g_free(s1->g); + g_free(s1->h); + g_free(s1); + + s2 = g_malloc0(sizeof(TestStructLinked)); + QIDL_VISIT_TYPE(TestStructLinked, qmp_input_get_visitor(qiv), &s2, NULL, &err); + g_assert(err == NULL); + + g_assert_cmpint(s2->a, ==, 0); + g_assert_cmpint(s2->b, ==, INT32_MAX); + g_assert_cmpint(s2->c, ==, 0); + g_assert_cmpint(s2->d, ==, UINT32_MAX); + g_assert_cmpint(s2->e, ==, 0); + g_assert_cmpint(s2->f, ==, UINT64_MAX); + g_assert_cmpstr(s2->g, ==, "test string g"); + g_assert(s2->h == NULL); + + qmp_input_visitor_cleanup(qiv); + g_free(s2->g); + g_free(s2); + + props = QIDL_PROPERTIES(TestStructLinked); + g_assert_cmpstr(props[0].name, ==, "f"); + g_assert_cmpint(props[0].defval, ==, 42); + g_assert_cmpstr(props[1].name, ==, "g"); + g_assert_cmpint(props[1].defval, ==, 0); + g_assert_cmpstr(props[2].name, ==, "h"); + g_assert_cmpint(props[2].defval, ==, 0); + g_assert(props[3].name == NULL); +} diff --git a/tests/test-qidl-linked.h b/tests/test-qidl-linked.h new file mode 100644 index 0000000..1b100a2 --- /dev/null +++ b/tests/test-qidl-linked.h @@ -0,0 +1,18 @@ +/* + * Unit-tests for QIDL-generated visitors/code + * + * Copyright IBM, Corp. 2012 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef TEST_QIDL_LINKED_H +#define TEST_QIDL_LINKED_H + +void test_linked_object_annotations(gconstpointer opaque); + +#endif diff --git a/tests/test-qidl.c b/tests/test-qidl.c new file mode 100644 index 0000000..2150bbb --- /dev/null +++ b/tests/test-qidl.c @@ -0,0 +1,187 @@ +/* + * Unit-tests for QIDL-generated visitors/code + * + * Copyright IBM, Corp. 2012 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include +#include "qidl.h" +#include "test-qidl-included.h" +#include "test-qidl-linked.h" +#include "hw/qdev-properties.h" +#include "qapi/qmp-input-visitor.h" +#include "qapi/qmp-output-visitor.h" +#include "qapi/qapi-dealloc-visitor.h" + +QIDL_ENABLE() + +PropertyInfo qdev_prop_uint64; +PropertyInfo qdev_prop_string; + +typedef struct TestStructMain TestStructMain; + +QIDL_DECLARE(TestStructMain) { + int32_t q_immutable a; + int32_t b; + uint32_t q_immutable c; + uint32_t d; + uint64_t q_immutable e; + uint64_t q_property("f", 42) f; + char q_property("g") *g; + char q_property("h") q_immutable *h; +}; + +/* exercise generated code from annotations in main() object file */ +static void test_main_object_annotations(gconstpointer opaque) +{ + TestStructMain *s1, *s2 = NULL; + Property *props; + QmpInputVisitor *qiv; + QmpOutputVisitor *qov; + QObject *s1_obj; + Error *err = NULL; + + s1 = g_malloc0(sizeof(TestStructMain)); + s1->a = 42; + s1->b = INT32_MAX; + s1->c = 43; + s1->d = UINT32_MAX; + s1->e = 44; + s1->f = UINT64_MAX; + s1->g = g_strdup("test string g"); + s1->h = g_strdup("test string h"); + + qov = qmp_output_visitor_new(); + QIDL_VISIT_TYPE(TestStructMain, qmp_output_get_visitor(qov), &s1, NULL, &err); + g_assert(err == NULL); + + s1_obj = qmp_output_get_qobject(qov); + qiv = qmp_input_visitor_new(s1_obj); + + qobject_decref(s1_obj); + qmp_output_visitor_cleanup(qov); + g_free(s1->g); + g_free(s1->h); + g_free(s1); + + s2 = g_malloc0(sizeof(TestStructMain)); + QIDL_VISIT_TYPE(TestStructMain, qmp_input_get_visitor(qiv), &s2, NULL, &err); + g_assert(err == NULL); + + g_assert_cmpint(s2->a, ==, 0); + g_assert_cmpint(s2->b, ==, INT32_MAX); + g_assert_cmpint(s2->c, ==, 0); + g_assert_cmpint(s2->d, ==, UINT32_MAX); + g_assert_cmpint(s2->e, ==, 0); + g_assert_cmpint(s2->f, ==, UINT64_MAX); + g_assert_cmpstr(s2->g, ==, "test string g"); + g_assert(s2->h == NULL); + + qmp_input_visitor_cleanup(qiv); + g_free(s2->g); + g_free(s2); + + props = QIDL_PROPERTIES(TestStructMain); + g_assert_cmpstr(props[0].name, ==, "f"); + g_assert_cmpint(props[0].defval, ==, 42); + g_assert_cmpstr(props[1].name, ==, "g"); + g_assert_cmpint(props[1].defval, ==, 0); + g_assert_cmpstr(props[2].name, ==, "h"); + g_assert_cmpint(props[2].defval, ==, 0); + g_assert(props[3].name == NULL); +} + +/* exercise generated code from simplified annotations in main() object file */ +static void test_main_object_annotations_simple(gconstpointer opaque) +{ + test_main_object_annotations(opaque); +} + +/* exercise generated code from annotations in included header files */ +static void test_header_file_annotations(gconstpointer opaque) +{ + TestStructIncluded *s1, *s2 = NULL; + Property *props; + QmpInputVisitor *qiv; + QmpOutputVisitor *qov; + QObject *s1_obj; + Error *err = NULL; + + s1 = g_malloc0(sizeof(TestStructIncluded)); + s1->a = 42; + s1->b = INT32_MAX; + s1->c = 43; + s1->d = UINT32_MAX; + s1->e = 44; + s1->f = UINT64_MAX; + s1->g = g_strdup("test string g"); + s1->h = g_strdup("test string h"); + + qov = qmp_output_visitor_new(); + QIDL_VISIT_TYPE(TestStructIncluded, qmp_output_get_visitor(qov), &s1, NULL, &err); + g_assert(err == NULL); + + s1_obj = qmp_output_get_qobject(qov); + qiv = qmp_input_visitor_new(s1_obj); + + qobject_decref(s1_obj); + qmp_output_visitor_cleanup(qov); + g_free(s1->g); + g_free(s1->h); + g_free(s1); + + s2 = g_malloc0(sizeof(TestStructIncluded)); + QIDL_VISIT_TYPE(TestStructIncluded, qmp_input_get_visitor(qiv), &s2, NULL, &err); + g_assert(err == NULL); + + g_assert_cmpint(s2->a, ==, 0); + g_assert_cmpint(s2->b, ==, INT32_MAX); + g_assert_cmpint(s2->c, ==, 0); + g_assert_cmpint(s2->d, ==, UINT32_MAX); + g_assert_cmpint(s2->e, ==, 0); + g_assert_cmpint(s2->f, ==, UINT64_MAX); + g_assert_cmpstr(s2->g, ==, "test string g"); + g_assert(s2->h == NULL); + + qmp_input_visitor_cleanup(qiv); + g_free(s2->g); + g_free(s2); + + props = QIDL_PROPERTIES(TestStructIncluded); + g_assert_cmpstr(props[0].name, ==, "f"); + g_assert_cmpint(props[0].defval, ==, 42); + g_assert_cmpstr(props[1].name, ==, "g"); + g_assert_cmpint(props[1].defval, ==, 0); + g_assert_cmpstr(props[2].name, ==, "h"); + g_assert_cmpint(props[2].defval, ==, 0); + g_assert(props[3].name == NULL); +} + +int main(int argc, char **argv) +{ + module_call_init(MODULE_INIT_QOM); + module_call_init(MODULE_INIT_QIDL); + + g_test_init(&argc, &argv, NULL); + + g_test_add_data_func("/qidl/build_test/main_object_annotations", NULL, + test_main_object_annotations); + g_test_add_data_func("/qidl/build_test/main_object_annotations_simple", NULL, + test_main_object_annotations_simple); + g_test_add_data_func("/qidl/build_test/linked_object_annotations", NULL, + test_linked_object_annotations); + g_test_add_data_func("/qidl/build_test/header_file_annotations", NULL, + test_header_file_annotations); + + g_test_run(); + + return 0; +} -- 1.7.9.5