Signed-off-by: Lluís Vilanova <vilan...@ac.upc.edu>
---
tests/Makefile | 4 +++-
tests/qapi-schema/include-cycle-b.json | 1 +
tests/qapi-schema/include-cycle-c.json | 1 +
tests/qapi-schema/include-cycle.err | 1 +
tests/qapi-schema/include-cycle.exit | 1 +
tests/qapi-schema/include-cycle.json | 1 +
tests/qapi-schema/include-cycle.out | 0
tests/qapi-schema/include-nested-err.err | 1 +
tests/qapi-schema/include-nested-err.exit | 1 +
tests/qapi-schema/include-nested-err.json | 1 +
tests/qapi-schema/include-nested-err.out | 0
tests/qapi-schema/include-no-file.err | 1 +
tests/qapi-schema/include-no-file.exit | 1 +
tests/qapi-schema/include-no-file.json | 1 +
tests/qapi-schema/include-no-file.out | 0
tests/qapi-schema/include-self-cycle.err | 1 +
tests/qapi-schema/include-self-cycle.exit | 1 +
tests/qapi-schema/include-self-cycle.json | 1 +
tests/qapi-schema/include-self-cycle.out | 0
tests/qapi-schema/include-simple-sub.json | 2 ++
tests/qapi-schema/include-simple.err | 0
tests/qapi-schema/include-simple.exit | 1 +
tests/qapi-schema/include-simple.json | 1 +
tests/qapi-schema/include-simple.out | 3 +++
24 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 tests/qapi-schema/include-cycle-b.json
create mode 100644 tests/qapi-schema/include-cycle-c.json
create mode 100644 tests/qapi-schema/include-cycle.err
create mode 100644 tests/qapi-schema/include-cycle.exit
create mode 100644 tests/qapi-schema/include-cycle.json
create mode 100644 tests/qapi-schema/include-cycle.out
create mode 100644 tests/qapi-schema/include-nested-err.err
create mode 100644 tests/qapi-schema/include-nested-err.exit
create mode 100644 tests/qapi-schema/include-nested-err.json
create mode 100644 tests/qapi-schema/include-nested-err.out
create mode 100644 tests/qapi-schema/include-no-file.err
create mode 100644 tests/qapi-schema/include-no-file.exit
create mode 100644 tests/qapi-schema/include-no-file.json
create mode 100644 tests/qapi-schema/include-no-file.out
create mode 100644 tests/qapi-schema/include-self-cycle.err
create mode 100644 tests/qapi-schema/include-self-cycle.exit
create mode 100644 tests/qapi-schema/include-self-cycle.json
create mode 100644 tests/qapi-schema/include-self-cycle.out
create mode 100644 tests/qapi-schema/include-simple-sub.json
create mode 100644 tests/qapi-schema/include-simple.err
create mode 100644 tests/qapi-schema/include-simple.exit
create mode 100644 tests/qapi-schema/include-simple.json
create mode 100644 tests/qapi-schema/include-simple.out
diff --git a/tests/Makefile b/tests/Makefile
index 02b0dbc..f4aae8c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -142,7 +142,9 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
missing-comma-object.json non-objects.json \
qapi-schema-test.json quoted-structural-chars.json \
trailing-comma-list.json trailing-comma-object.json \
- unclosed-list.json unclosed-object.json unclosed-string.json)
+ unclosed-list.json unclosed-object.json unclosed-string.json \
+ include-simple.json include-nested-err.json include-no-file.json \
+ include-self-cycle.json include-cycle.json)
GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h
tests/test-qmp-commands.h
diff --git a/tests/qapi-schema/include-cycle-b.json
b/tests/qapi-schema/include-cycle-b.json
new file mode 100644
index 0000000..baf4282
--- /dev/null
+++ b/tests/qapi-schema/include-cycle-b.json
@@ -0,0 +1 @@
+include("include-cycle-c.json")
diff --git a/tests/qapi-schema/include-cycle-c.json
b/tests/qapi-schema/include-cycle-c.json
new file mode 100644
index 0000000..90ffa6a
--- /dev/null
+++ b/tests/qapi-schema/include-cycle-c.json
@@ -0,0 +1 @@
+include("include-cycle.json")
diff --git a/tests/qapi-schema/include-cycle.err
b/tests/qapi-schema/include-cycle.err
new file mode 100644
index 0000000..48003d3
--- /dev/null
+++ b/tests/qapi-schema/include-cycle.err
@@ -0,0 +1 @@
+include-cycle-c.json:1:1: Infinite inclusion loop: include-cycle.json ->
include-cycle-b.json -> include-cycle-c.json -> include-cycle.json
diff --git a/tests/qapi-schema/include-cycle.exit
b/tests/qapi-schema/include-cycle.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/include-cycle.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/include-cycle.json
b/tests/qapi-schema/include-cycle.json
new file mode 100644
index 0000000..4f00e7e
--- /dev/null
+++ b/tests/qapi-schema/include-cycle.json
@@ -0,0 +1 @@
+include("include-cycle-b.json")
diff --git a/tests/qapi-schema/include-cycle.out
b/tests/qapi-schema/include-cycle.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/include-nested-err.err
b/tests/qapi-schema/include-nested-err.err
new file mode 100644
index 0000000..676cce5
--- /dev/null
+++ b/tests/qapi-schema/include-nested-err.err
@@ -0,0 +1 @@
+missing-colon.json:1:10: Expected ":"
diff --git a/tests/qapi-schema/include-nested-err.exit
b/tests/qapi-schema/include-nested-err.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/include-nested-err.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/include-nested-err.json
b/tests/qapi-schema/include-nested-err.json
new file mode 100644
index 0000000..ff53883
--- /dev/null
+++ b/tests/qapi-schema/include-nested-err.json
@@ -0,0 +1 @@
+include("missing-colon.json")
diff --git a/tests/qapi-schema/include-nested-err.out
b/tests/qapi-schema/include-nested-err.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/include-no-file.err
b/tests/qapi-schema/include-no-file.err
new file mode 100644
index 0000000..24832c1
--- /dev/null
+++ b/tests/qapi-schema/include-no-file.err
@@ -0,0 +1 @@
+include-no-file.json:1:1: Non-existing included file "include-no-file-sub.json"
diff --git a/tests/qapi-schema/include-no-file.exit
b/tests/qapi-schema/include-no-file.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/include-no-file.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/include-no-file.json
b/tests/qapi-schema/include-no-file.json
new file mode 100644
index 0000000..df762c2
--- /dev/null
+++ b/tests/qapi-schema/include-no-file.json
@@ -0,0 +1 @@
+include("include-no-file-sub.json")
diff --git a/tests/qapi-schema/include-no-file.out
b/tests/qapi-schema/include-no-file.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/include-self-cycle.err
b/tests/qapi-schema/include-self-cycle.err
new file mode 100644
index 0000000..c2b216a
--- /dev/null
+++ b/tests/qapi-schema/include-self-cycle.err
@@ -0,0 +1 @@
+include-self-cycle.json:1:1: Infinite inclusion loop: include-self-cycle.json
-> include-self-cycle.json
diff --git a/tests/qapi-schema/include-self-cycle.exit
b/tests/qapi-schema/include-self-cycle.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/include-self-cycle.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/include-self-cycle.json
b/tests/qapi-schema/include-self-cycle.json
new file mode 100644
index 0000000..1c418c0
--- /dev/null
+++ b/tests/qapi-schema/include-self-cycle.json
@@ -0,0 +1 @@
+include("include-self-cycle.json")
diff --git a/tests/qapi-schema/include-self-cycle.out
b/tests/qapi-schema/include-self-cycle.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/include-simple-sub.json
b/tests/qapi-schema/include-simple-sub.json
new file mode 100644
index 0000000..4bd4af4
--- /dev/null
+++ b/tests/qapi-schema/include-simple-sub.json
@@ -0,0 +1,2 @@
+{ 'enum': 'Status',
+ 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/tests/qapi-schema/include-simple.err
b/tests/qapi-schema/include-simple.err
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/include-simple.exit
b/tests/qapi-schema/include-simple.exit
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/tests/qapi-schema/include-simple.exit
@@ -0,0 +1 @@
+0
diff --git a/tests/qapi-schema/include-simple.json
b/tests/qapi-schema/include-simple.json
new file mode 100644
index 0000000..31c81d1
--- /dev/null
+++ b/tests/qapi-schema/include-simple.json
@@ -0,0 +1 @@
+include("include-simple-sub.json")
diff --git a/tests/qapi-schema/include-simple.out
b/tests/qapi-schema/include-simple.out
new file mode 100644
index 0000000..e3bd904
--- /dev/null
+++ b/tests/qapi-schema/include-simple.out
@@ -0,0 +1,3 @@
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
+['Status']
+[]
