0a122b
From 6a72b8101fdaa33464d6f82e7a7963e4aa135f41 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <6a72b8101fdaa33464d6f82e7a7963e4aa135f41.1387369730.git.minovotn@redhat.com>
0a122b
In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
0a122b
References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
0a122b
From: Markus Armbruster <armbru@redhat.com>
0a122b
Date: Tue, 10 Dec 2013 15:29:11 +0100
0a122b
Subject: [PATCH 11/21] tests: QAPI schema parser tests
0a122b
0a122b
RH-Author: Markus Armbruster <armbru@redhat.com>
0a122b
Message-id: <1386689361-30281-9-git-send-email-armbru@redhat.com>
0a122b
Patchwork-id: 56130
0a122b
O-Subject: [PATCH 7.0 qemu-kvm 08/18] tests: QAPI schema parser tests
0a122b
Bugzilla: 997915
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
0a122b
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
0a122b
0a122b
From: Markus Armbruster <armbru@redhat.com>
0a122b
0a122b
The parser handles erroneous input badly.  To be improved shortly.
0a122b
0a122b
Signed-off-by: Markus Armbruster <armbru@redhat.com>
0a122b
Message-id: 1374939721-7876-2-git-send-email-armbru@redhat.com
0a122b
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
0a122b
(cherry picked from commit 98626572f18ddc61c08588c32a1773bc91f8624e)
0a122b
---
0a122b
 configure                                      |  2 +-
0a122b
 tests/Makefile                                 | 24 ++++++++++++++++++++++--
0a122b
 tests/qapi-schema/comments.err                 |  0
0a122b
 tests/qapi-schema/comments.exit                |  1 +
0a122b
 tests/qapi-schema/comments.json                |  4 ++++
0a122b
 tests/qapi-schema/comments.out                 |  3 +++
0a122b
 tests/qapi-schema/empty.err                    |  0
0a122b
 tests/qapi-schema/empty.exit                   |  1 +
0a122b
 tests/qapi-schema/empty.json                   |  0
0a122b
 tests/qapi-schema/empty.out                    |  3 +++
0a122b
 tests/qapi-schema/funny-char.err               |  0
0a122b
 tests/qapi-schema/funny-char.exit              |  1 +
0a122b
 tests/qapi-schema/funny-char.json              |  2 ++
0a122b
 tests/qapi-schema/funny-char.out               |  3 +++
0a122b
 tests/qapi-schema/indented-expr.err            |  0
0a122b
 tests/qapi-schema/indented-expr.exit           |  1 +
0a122b
 tests/qapi-schema/indented-expr.json           |  2 ++
0a122b
 tests/qapi-schema/indented-expr.out            |  3 +++
0a122b
 tests/qapi-schema/missing-colon.err            |  0
0a122b
 tests/qapi-schema/missing-colon.exit           |  1 +
0a122b
 tests/qapi-schema/missing-colon.json           |  2 ++
0a122b
 tests/qapi-schema/missing-colon.out            |  3 +++
0a122b
 tests/qapi-schema/missing-comma-list.err       |  0
0a122b
 tests/qapi-schema/missing-comma-list.exit      |  1 +
0a122b
 tests/qapi-schema/missing-comma-list.json      |  2 ++
0a122b
 tests/qapi-schema/missing-comma-list.out       |  3 +++
0a122b
 tests/qapi-schema/missing-comma-object.err     |  0
0a122b
 tests/qapi-schema/missing-comma-object.exit    |  1 +
0a122b
 tests/qapi-schema/missing-comma-object.json    |  2 ++
0a122b
 tests/qapi-schema/missing-comma-object.out     |  3 +++
0a122b
 tests/qapi-schema/non-objects.err              |  1 +
0a122b
 tests/qapi-schema/non-objects.exit             |  1 +
0a122b
 tests/qapi-schema/non-objects.json             |  2 ++
0a122b
 tests/qapi-schema/non-objects.out              |  0
0a122b
 tests/qapi-schema/quoted-structural-chars.err  |  0
0a122b
 tests/qapi-schema/quoted-structural-chars.exit |  1 +
0a122b
 tests/qapi-schema/quoted-structural-chars.json |  1 +
0a122b
 tests/qapi-schema/quoted-structural-chars.out  |  3 +++
0a122b
 tests/qapi-schema/test-qapi.py                 | 25 +++++++++++++++++++++++++
0a122b
 tests/qapi-schema/trailing-comma-list.err      |  0
0a122b
 tests/qapi-schema/trailing-comma-list.exit     |  1 +
0a122b
 tests/qapi-schema/trailing-comma-list.json     |  2 ++
0a122b
 tests/qapi-schema/trailing-comma-list.out      |  3 +++
0a122b
 tests/qapi-schema/trailing-comma-object.err    |  0
0a122b
 tests/qapi-schema/trailing-comma-object.exit   |  1 +
0a122b
 tests/qapi-schema/trailing-comma-object.json   |  2 ++
0a122b
 tests/qapi-schema/trailing-comma-object.out    |  3 +++
0a122b
 tests/qapi-schema/unclosed-list.err            |  1 +
0a122b
 tests/qapi-schema/unclosed-list.exit           |  1 +
0a122b
 tests/qapi-schema/unclosed-list.json           |  1 +
0a122b
 tests/qapi-schema/unclosed-list.out            |  0
0a122b
 tests/qapi-schema/unclosed-object.err          |  1 +
0a122b
 tests/qapi-schema/unclosed-object.exit         |  1 +
0a122b
 tests/qapi-schema/unclosed-object.json         |  1 +
0a122b
 tests/qapi-schema/unclosed-object.out          |  0
0a122b
 tests/qapi-schema/unclosed-string.err          |  1 +
0a122b
 tests/qapi-schema/unclosed-string.exit         |  1 +
0a122b
 tests/qapi-schema/unclosed-string.json         |  2 ++
0a122b
 tests/qapi-schema/unclosed-string.out          |  0
0a122b
 59 files changed, 121 insertions(+), 3 deletions(-)
0a122b
 create mode 100644 tests/qapi-schema/comments.err
0a122b
 create mode 100644 tests/qapi-schema/comments.exit
0a122b
 create mode 100644 tests/qapi-schema/comments.json
0a122b
 create mode 100644 tests/qapi-schema/comments.out
0a122b
 create mode 100644 tests/qapi-schema/empty.err
0a122b
 create mode 100644 tests/qapi-schema/empty.exit
0a122b
 create mode 100644 tests/qapi-schema/empty.json
0a122b
 create mode 100644 tests/qapi-schema/empty.out
0a122b
 create mode 100644 tests/qapi-schema/funny-char.err
0a122b
 create mode 100644 tests/qapi-schema/funny-char.exit
0a122b
 create mode 100644 tests/qapi-schema/funny-char.json
0a122b
 create mode 100644 tests/qapi-schema/funny-char.out
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.err
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.exit
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.json
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.out
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.err
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.exit
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.json
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.out
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.err
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.exit
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.json
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.out
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.err
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.exit
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.json
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.out
0a122b
 create mode 100644 tests/qapi-schema/non-objects.err
0a122b
 create mode 100644 tests/qapi-schema/non-objects.exit
0a122b
 create mode 100644 tests/qapi-schema/non-objects.json
0a122b
 create mode 100644 tests/qapi-schema/non-objects.out
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.err
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.exit
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.json
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.out
0a122b
 create mode 100644 tests/qapi-schema/test-qapi.py
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.err
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.exit
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.json
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.out
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.err
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.exit
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.json
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.out
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.err
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.exit
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.json
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.out
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.err
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.exit
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.json
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.out
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.err
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.exit
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.json
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.out
0a122b
0a122b
diff --git a/tests/qapi-schema/unclosed-string.out b/tests/qapi-schema/unclosed-string.out
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 configure                                      |  2 +-
0a122b
 tests/Makefile                                 | 24 ++++++++++++++++++++++--
0a122b
 tests/qapi-schema/comments.exit                |  1 +
0a122b
 tests/qapi-schema/comments.json                |  4 ++++
0a122b
 tests/qapi-schema/comments.out                 |  3 +++
0a122b
 tests/qapi-schema/empty.exit                   |  1 +
0a122b
 tests/qapi-schema/empty.out                    |  3 +++
0a122b
 tests/qapi-schema/funny-char.exit              |  1 +
0a122b
 tests/qapi-schema/funny-char.json              |  2 ++
0a122b
 tests/qapi-schema/funny-char.out               |  3 +++
0a122b
 tests/qapi-schema/indented-expr.exit           |  1 +
0a122b
 tests/qapi-schema/indented-expr.json           |  2 ++
0a122b
 tests/qapi-schema/indented-expr.out            |  3 +++
0a122b
 tests/qapi-schema/missing-colon.exit           |  1 +
0a122b
 tests/qapi-schema/missing-colon.json           |  2 ++
0a122b
 tests/qapi-schema/missing-colon.out            |  3 +++
0a122b
 tests/qapi-schema/missing-comma-list.exit      |  1 +
0a122b
 tests/qapi-schema/missing-comma-list.json      |  2 ++
0a122b
 tests/qapi-schema/missing-comma-list.out       |  3 +++
0a122b
 tests/qapi-schema/missing-comma-object.exit    |  1 +
0a122b
 tests/qapi-schema/missing-comma-object.json    |  2 ++
0a122b
 tests/qapi-schema/missing-comma-object.out     |  3 +++
0a122b
 tests/qapi-schema/non-objects.err              |  1 +
0a122b
 tests/qapi-schema/non-objects.exit             |  1 +
0a122b
 tests/qapi-schema/non-objects.json             |  2 ++
0a122b
 tests/qapi-schema/quoted-structural-chars.exit |  1 +
0a122b
 tests/qapi-schema/quoted-structural-chars.json |  1 +
0a122b
 tests/qapi-schema/quoted-structural-chars.out  |  3 +++
0a122b
 tests/qapi-schema/test-qapi.py                 | 25 +++++++++++++++++++++++++
0a122b
 tests/qapi-schema/trailing-comma-list.exit     |  1 +
0a122b
 tests/qapi-schema/trailing-comma-list.json     |  2 ++
0a122b
 tests/qapi-schema/trailing-comma-list.out      |  3 +++
0a122b
 tests/qapi-schema/trailing-comma-object.exit   |  1 +
0a122b
 tests/qapi-schema/trailing-comma-object.json   |  2 ++
0a122b
 tests/qapi-schema/trailing-comma-object.out    |  3 +++
0a122b
 tests/qapi-schema/unclosed-list.err            |  1 +
0a122b
 tests/qapi-schema/unclosed-list.exit           |  1 +
0a122b
 tests/qapi-schema/unclosed-list.json           |  1 +
0a122b
 tests/qapi-schema/unclosed-object.err          |  1 +
0a122b
 tests/qapi-schema/unclosed-object.exit         |  1 +
0a122b
 tests/qapi-schema/unclosed-object.json         |  1 +
0a122b
 tests/qapi-schema/unclosed-string.err          |  1 +
0a122b
 tests/qapi-schema/unclosed-string.exit         |  1 +
0a122b
 tests/qapi-schema/unclosed-string.json         |  2 ++
0a122b
 44 files changed, 121 insertions(+), 3 deletions(-)
0a122b
 create mode 100644 tests/qapi-schema/comments.err
0a122b
 create mode 100644 tests/qapi-schema/comments.exit
0a122b
 create mode 100644 tests/qapi-schema/comments.json
0a122b
 create mode 100644 tests/qapi-schema/comments.out
0a122b
 create mode 100644 tests/qapi-schema/empty.err
0a122b
 create mode 100644 tests/qapi-schema/empty.exit
0a122b
 create mode 100644 tests/qapi-schema/empty.json
0a122b
 create mode 100644 tests/qapi-schema/empty.out
0a122b
 create mode 100644 tests/qapi-schema/funny-char.err
0a122b
 create mode 100644 tests/qapi-schema/funny-char.exit
0a122b
 create mode 100644 tests/qapi-schema/funny-char.json
0a122b
 create mode 100644 tests/qapi-schema/funny-char.out
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.err
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.exit
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.json
0a122b
 create mode 100644 tests/qapi-schema/indented-expr.out
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.err
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.exit
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.json
0a122b
 create mode 100644 tests/qapi-schema/missing-colon.out
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.err
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.exit
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.json
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-list.out
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.err
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.exit
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.json
0a122b
 create mode 100644 tests/qapi-schema/missing-comma-object.out
0a122b
 create mode 100644 tests/qapi-schema/non-objects.err
0a122b
 create mode 100644 tests/qapi-schema/non-objects.exit
0a122b
 create mode 100644 tests/qapi-schema/non-objects.json
0a122b
 create mode 100644 tests/qapi-schema/non-objects.out
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.err
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.exit
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.json
0a122b
 create mode 100644 tests/qapi-schema/quoted-structural-chars.out
0a122b
 create mode 100644 tests/qapi-schema/test-qapi.py
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.err
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.exit
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.json
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-list.out
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.err
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.exit
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.json
0a122b
 create mode 100644 tests/qapi-schema/trailing-comma-object.out
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.err
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.exit
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.json
0a122b
 create mode 100644 tests/qapi-schema/unclosed-list.out
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.err
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.exit
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.json
0a122b
 create mode 100644 tests/qapi-schema/unclosed-object.out
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.err
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.exit
0a122b
 create mode 100644 tests/qapi-schema/unclosed-string.json
0a122b
0a122b
diff --git a/configure b/configure
0a122b
index f86793d..0a729ac 100755
0a122b
--- a/configure
0a122b
+++ b/configure
0a122b
@@ -4511,7 +4511,7 @@ if [ "$dtc_internal" = "yes" ]; then
0a122b
 fi
0a122b
 
0a122b
 # build tree in object directory in case the source is not in the current directory
0a122b
-DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos"
0a122b
+DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema"
0a122b
 DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
0a122b
 DIRS="$DIRS roms/seabios roms/vgabios"
0a122b
 DIRS="$DIRS qapi-generated"
0a122b
diff --git a/tests/Makefile b/tests/Makefile
0a122b
index 2e9093e..e96982b 100644
0a122b
--- a/tests/Makefile
0a122b
+++ b/tests/Makefile
0a122b
@@ -70,6 +70,14 @@ gcov-files-sparc64-y += hw/m48t59.c
0a122b
 check-qtest-arm-y = tests/tmp105-test$(EXESUF)
0a122b
 gcov-files-arm-y += hw/tmp105.c
0a122b
 
0a122b
+check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
0a122b
+        comments.json empty.json funny-char.json indented-expr.json \
0a122b
+        missing-colon.json missing-comma-list.json \
0a122b
+        missing-comma-object.json non-objects.json \
0a122b
+        quoted-structural-chars.json \
0a122b
+        trailing-comma-list.json trailing-comma-object.json \
0a122b
+        unclosed-list.json unclosed-object.json unclosed-string.json)
0a122b
+
0a122b
 GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h tests/test-qmp-commands.h
0a122b
 
0a122b
 test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \
0a122b
@@ -157,6 +165,7 @@ check-help:
0a122b
 	@echo " make check-qtest-TARGET   Run qtest tests for given target"
0a122b
 	@echo " make check-qtest          Run qtest tests"
0a122b
 	@echo " make check-unit           Run qobject tests"
0a122b
+	@echo " make check-qapi-schema    Run QAPI schema tests"
0a122b
 	@echo " make check-block          Run block tests"
0a122b
 	@echo " make check-report.html    Generates an HTML test report"
0a122b
 	@echo
0a122b
@@ -219,12 +228,23 @@ check-report.html: check-report.xml
0a122b
 check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF)
0a122b
 	$<
0a122b
 
0a122b
+.PHONY: check-tests/test-qapi.py
0a122b
+check-tests/test-qapi.py: tests/test-qapi.py
0a122b
+
0a122b
+.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
0a122b
+$(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
0a122b
+	$(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py <$^ >$*.out 2>$*.err; echo $$? >$*.exit, "  TEST  $*.out")
0a122b
+	@diff -q $(SRC_PATH)/$*.out $*.out
0a122b
+	@diff -q $(SRC_PATH)/$*.err $*.err
0a122b
+	@diff -q $(SRC_PATH)/$*.exit $*.exit
0a122b
+
0a122b
 # Consolidated targets
0a122b
 
0a122b
-.PHONY: check-qtest check-unit check
0a122b
+.PHONY: check-qapi-schema check-qtest check-unit check
0a122b
+check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y))
0a122b
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
0a122b
 check-unit: $(patsubst %,check-%, $(check-unit-y))
0a122b
 check-block: $(patsubst %,check-%, $(check-block-y))
0a122b
-check: check-unit check-qtest
0a122b
+check: check-qapi-schema check-unit check-qtest
0a122b
 
0a122b
 -include $(wildcard tests/*.d)
0a122b
diff --git a/tests/qapi-schema/comments.err b/tests/qapi-schema/comments.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/comments.exit b/tests/qapi-schema/comments.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/comments.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/comments.json b/tests/qapi-schema/comments.json
0a122b
new file mode 100644
0a122b
index 0000000..e643f3a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/comments.json
0a122b
@@ -0,0 +1,4 @@
0a122b
+# Unindented comment
0a122b
+{ 'enum': 'Status',             # Comment to the right of code
0a122b
+  # Indented comment
0a122b
+  'data': [ 'good', 'bad', 'ugly' ] }
0a122b
diff --git a/tests/qapi-schema/comments.out b/tests/qapi-schema/comments.out
0a122b
new file mode 100644
0a122b
index 0000000..e3bd904
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/comments.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+['Status']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/empty.err b/tests/qapi-schema/empty.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/empty.exit b/tests/qapi-schema/empty.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/empty.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/empty.json b/tests/qapi-schema/empty.json
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/empty.out b/tests/qapi-schema/empty.out
0a122b
new file mode 100644
0a122b
index 0000000..b7f89a4
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/empty.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[]
0a122b
+[]
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/funny-char.err b/tests/qapi-schema/funny-char.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/funny-char.exit b/tests/qapi-schema/funny-char.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/funny-char.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/funny-char.json b/tests/qapi-schema/funny-char.json
0a122b
new file mode 100644
0a122b
index 0000000..d4973a2
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/funny-char.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'enum': 'Status',
0a122b
+  'data': [ 'good', 'bad', 'ugly' ]; }
0a122b
diff --git a/tests/qapi-schema/funny-char.out b/tests/qapi-schema/funny-char.out
0a122b
new file mode 100644
0a122b
index 0000000..e3bd904
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/funny-char.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+['Status']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/indented-expr.err b/tests/qapi-schema/indented-expr.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/indented-expr.exit b/tests/qapi-schema/indented-expr.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/indented-expr.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/indented-expr.json b/tests/qapi-schema/indented-expr.json
0a122b
new file mode 100644
0a122b
index 0000000..d80af60
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/indented-expr.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'id' : 'eins' }
0a122b
+ { 'id' : 'zwei' }
0a122b
diff --git a/tests/qapi-schema/indented-expr.out b/tests/qapi-schema/indented-expr.out
0a122b
new file mode 100644
0a122b
index 0000000..98ae692
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/indented-expr.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('id', 'eins')])]
0a122b
+[]
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/missing-colon.err b/tests/qapi-schema/missing-colon.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/missing-colon.exit b/tests/qapi-schema/missing-colon.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-colon.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/missing-colon.json b/tests/qapi-schema/missing-colon.json
0a122b
new file mode 100644
0a122b
index 0000000..6fc27ce
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-colon.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'enum' 'Status',
0a122b
+  'data': [ 'good', 'bad', 'ugly' ] }
0a122b
diff --git a/tests/qapi-schema/missing-colon.out b/tests/qapi-schema/missing-colon.out
0a122b
new file mode 100644
0a122b
index 0000000..50f827e
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-colon.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', ','), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+[',']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/missing-comma-list.err b/tests/qapi-schema/missing-comma-list.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/missing-comma-list.exit b/tests/qapi-schema/missing-comma-list.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-comma-list.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/missing-comma-list.json b/tests/qapi-schema/missing-comma-list.json
0a122b
new file mode 100644
0a122b
index 0000000..1af39b2
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-comma-list.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'enum': 'Status',
0a122b
+  'data': [ 'good' 'bad', 'ugly' ] }
0a122b
diff --git a/tests/qapi-schema/missing-comma-list.out b/tests/qapi-schema/missing-comma-list.out
0a122b
new file mode 100644
0a122b
index 0000000..e3bd904
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-comma-list.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+['Status']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/missing-comma-object.err b/tests/qapi-schema/missing-comma-object.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/missing-comma-object.exit b/tests/qapi-schema/missing-comma-object.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-comma-object.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/missing-comma-object.json b/tests/qapi-schema/missing-comma-object.json
0a122b
new file mode 100644
0a122b
index 0000000..50f5178
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-comma-object.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'enum': 'Status'
0a122b
+  'data': [ 'good', 'bad', 'ugly' ] }
0a122b
diff --git a/tests/qapi-schema/missing-comma-object.out b/tests/qapi-schema/missing-comma-object.out
0a122b
new file mode 100644
0a122b
index 0000000..e3bd904
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/missing-comma-object.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+['Status']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/non-objects.err b/tests/qapi-schema/non-objects.err
0a122b
new file mode 100644
0a122b
index 0000000..48c849d
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/non-objects.err
0a122b
@@ -0,0 +1 @@
0a122b
+Crashed: <type 'exceptions.attributeerror'="">
0a122b
diff --git a/tests/qapi-schema/non-objects.exit b/tests/qapi-schema/non-objects.exit
0a122b
new file mode 100644
0a122b
index 0000000..d00491f
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/non-objects.exit
0a122b
@@ -0,0 +1 @@
0a122b
+1
0a122b
diff --git a/tests/qapi-schema/non-objects.json b/tests/qapi-schema/non-objects.json
0a122b
new file mode 100644
0a122b
index 0000000..f3fa851
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/non-objects.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+'string'
0a122b
+[ ]
0a122b
diff --git a/tests/qapi-schema/non-objects.out b/tests/qapi-schema/non-objects.out
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/quoted-structural-chars.err b/tests/qapi-schema/quoted-structural-chars.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/quoted-structural-chars.exit b/tests/qapi-schema/quoted-structural-chars.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/quoted-structural-chars.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/quoted-structural-chars.json b/tests/qapi-schema/quoted-structural-chars.json
0a122b
new file mode 100644
0a122b
index 0000000..9fe657a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/quoted-structural-chars.json
0a122b
@@ -0,0 +1 @@
0a122b
+'{' 'key1' ':' 'value1' ',' 'key2' ':' '[' ']' '}'
0a122b
diff --git a/tests/qapi-schema/quoted-structural-chars.out b/tests/qapi-schema/quoted-structural-chars.out
0a122b
new file mode 100644
0a122b
index 0000000..85405be
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/quoted-structural-chars.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('key1', 'value1'), ('key2', [])])]
0a122b
+[]
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
0a122b
new file mode 100644
0a122b
index 0000000..3280eff
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/test-qapi.py
0a122b
@@ -0,0 +1,25 @@
0a122b
+#
0a122b
+# QAPI parser test harness
0a122b
+#
0a122b
+# Copyright (c) 2013 Red Hat Inc.
0a122b
+#
0a122b
+# Authors:
0a122b
+#  Markus Armbruster <armbru@redhat.com>
0a122b
+#
0a122b
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
0a122b
+# See the COPYING file in the top-level directory.
0a122b
+#
0a122b
+
0a122b
+from qapi import *
0a122b
+from pprint import pprint
0a122b
+import sys
0a122b
+
0a122b
+try:
0a122b
+    exprs = parse_schema(sys.stdin)
0a122b
+except:
0a122b
+    print >>sys.stderr, "Crashed:", sys.exc_info()[0]
0a122b
+    exit(1)
0a122b
+
0a122b
+pprint(exprs)
0a122b
+pprint(enum_types)
0a122b
+pprint(struct_types)
0a122b
diff --git a/tests/qapi-schema/trailing-comma-list.err b/tests/qapi-schema/trailing-comma-list.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/trailing-comma-list.exit b/tests/qapi-schema/trailing-comma-list.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/trailing-comma-list.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/trailing-comma-list.json b/tests/qapi-schema/trailing-comma-list.json
0a122b
new file mode 100644
0a122b
index 0000000..9b0c8bd
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/trailing-comma-list.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'enum': 'Status',
0a122b
+  'data': [ 'good', 'bad', 'ugly', ] }
0a122b
diff --git a/tests/qapi-schema/trailing-comma-list.out b/tests/qapi-schema/trailing-comma-list.out
0a122b
new file mode 100644
0a122b
index 0000000..e3bd904
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/trailing-comma-list.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+['Status']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/trailing-comma-object.err b/tests/qapi-schema/trailing-comma-object.err
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/trailing-comma-object.exit b/tests/qapi-schema/trailing-comma-object.exit
0a122b
new file mode 100644
0a122b
index 0000000..573541a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/trailing-comma-object.exit
0a122b
@@ -0,0 +1 @@
0a122b
+0
0a122b
diff --git a/tests/qapi-schema/trailing-comma-object.json b/tests/qapi-schema/trailing-comma-object.json
0a122b
new file mode 100644
0a122b
index 0000000..bbaea55
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/trailing-comma-object.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'enum': 'Status',
0a122b
+  'data': [ 'good', 'bad', 'ugly' ], }
0a122b
diff --git a/tests/qapi-schema/trailing-comma-object.out b/tests/qapi-schema/trailing-comma-object.out
0a122b
new file mode 100644
0a122b
index 0000000..e3bd904
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/trailing-comma-object.out
0a122b
@@ -0,0 +1,3 @@
0a122b
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
0a122b
+['Status']
0a122b
+[]
0a122b
diff --git a/tests/qapi-schema/unclosed-list.err b/tests/qapi-schema/unclosed-list.err
0a122b
new file mode 100644
0a122b
index 0000000..f9a9c2a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-list.err
0a122b
@@ -0,0 +1 @@
0a122b
+Crashed: <type 'exceptions.indexerror'="">
0a122b
diff --git a/tests/qapi-schema/unclosed-list.exit b/tests/qapi-schema/unclosed-list.exit
0a122b
new file mode 100644
0a122b
index 0000000..d00491f
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-list.exit
0a122b
@@ -0,0 +1 @@
0a122b
+1
0a122b
diff --git a/tests/qapi-schema/unclosed-list.json b/tests/qapi-schema/unclosed-list.json
0a122b
new file mode 100644
0a122b
index 0000000..e3e9566
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-list.json
0a122b
@@ -0,0 +1 @@
0a122b
+{ 'key': [ 'value' }
0a122b
diff --git a/tests/qapi-schema/unclosed-list.out b/tests/qapi-schema/unclosed-list.out
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/unclosed-object.err b/tests/qapi-schema/unclosed-object.err
0a122b
new file mode 100644
0a122b
index 0000000..f9a9c2a
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-object.err
0a122b
@@ -0,0 +1 @@
0a122b
+Crashed: <type 'exceptions.indexerror'="">
0a122b
diff --git a/tests/qapi-schema/unclosed-object.exit b/tests/qapi-schema/unclosed-object.exit
0a122b
new file mode 100644
0a122b
index 0000000..d00491f
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-object.exit
0a122b
@@ -0,0 +1 @@
0a122b
+1
0a122b
diff --git a/tests/qapi-schema/unclosed-object.json b/tests/qapi-schema/unclosed-object.json
0a122b
new file mode 100644
0a122b
index 0000000..8ac069d
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-object.json
0a122b
@@ -0,0 +1 @@
0a122b
+{ 'key': [ 'value' ]
0a122b
diff --git a/tests/qapi-schema/unclosed-object.out b/tests/qapi-schema/unclosed-object.out
0a122b
new file mode 100644
0a122b
index 0000000..e69de29
0a122b
diff --git a/tests/qapi-schema/unclosed-string.err b/tests/qapi-schema/unclosed-string.err
0a122b
new file mode 100644
0a122b
index 0000000..5af46c2
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-string.err
0a122b
@@ -0,0 +1 @@
0a122b
+Crashed: <type 'exceptions.exception'="">
0a122b
diff --git a/tests/qapi-schema/unclosed-string.exit b/tests/qapi-schema/unclosed-string.exit
0a122b
new file mode 100644
0a122b
index 0000000..d00491f
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-string.exit
0a122b
@@ -0,0 +1 @@
0a122b
+1
0a122b
diff --git a/tests/qapi-schema/unclosed-string.json b/tests/qapi-schema/unclosed-string.json
0a122b
new file mode 100644
0a122b
index 0000000..8c16b6b
0a122b
--- /dev/null
0a122b
+++ b/tests/qapi-schema/unclosed-string.json
0a122b
@@ -0,0 +1,2 @@
0a122b
+{ 'text': 'lorem ips
0a122b
+}
0a122b
-- 
0a122b
1.7.11.7
0a122b