[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/11] tests: add allowed-in-preconfig-test for q
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v6 07/11] tests: add allowed-in-preconfig-test for qapi-schema |
Date: |
Fri, 27 Apr 2018 17:05:19 +0200 |
make sure the QAPISchema can parse allowed-in-preconfig correctly
Signed-off-by: Igor Mammedov <address@hidden>
---
tests/Makefile.include | 1 +
tests/qapi-schema/allowed-in-preconfig-test.err | 1 +
tests/qapi-schema/allowed-in-preconfig-test.exit | 1 +
tests/qapi-schema/allowed-in-preconfig-test.json | 2 ++
tests/qapi-schema/allowed-in-preconfig-test.out | 0
tests/qapi-schema/qapi-schema-test.json | 3 +++
tests/qapi-schema/qapi-schema-test.out | 2 ++
tests/test-qmp-cmds.c | 4 ++++
8 files changed, 14 insertions(+)
create mode 100644 tests/qapi-schema/allowed-in-preconfig-test.err
create mode 100644 tests/qapi-schema/allowed-in-preconfig-test.exit
create mode 100644 tests/qapi-schema/allowed-in-preconfig-test.json
create mode 100644 tests/qapi-schema/allowed-in-preconfig-test.out
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3b9a5e3..4d2460d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -524,6 +524,7 @@ qapi-schema += missing-type.json
qapi-schema += nested-struct-data.json
qapi-schema += non-objects.json
qapi-schema += oob-test.json
+qapi-schema += allowed-in-preconfig-test.json
qapi-schema += pragma-doc-required-crap.json
qapi-schema += pragma-extra-junk.json
qapi-schema += pragma-name-case-whitelist-crap.json
diff --git a/tests/qapi-schema/allowed-in-preconfig-test.err
b/tests/qapi-schema/allowed-in-preconfig-test.err
new file mode 100644
index 0000000..2b0511b
--- /dev/null
+++ b/tests/qapi-schema/allowed-in-preconfig-test.err
@@ -0,0 +1 @@
+tests/qapi-schema/allowed-in-preconfig-test.json:2: 'allowed-in-preconfig' of
command 'allowed-in-preconfig-test' should only use true value
diff --git a/tests/qapi-schema/allowed-in-preconfig-test.exit
b/tests/qapi-schema/allowed-in-preconfig-test.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/allowed-in-preconfig-test.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/allowed-in-preconfig-test.json
b/tests/qapi-schema/allowed-in-preconfig-test.json
new file mode 100644
index 0000000..7e0e6cb
--- /dev/null
+++ b/tests/qapi-schema/allowed-in-preconfig-test.json
@@ -0,0 +1,2 @@
+# Check against allowed-in-preconfig illegal value
+{ 'command': 'allowed-in-preconfig-test', 'allowed-in-preconfig':
'some-string' }
diff --git a/tests/qapi-schema/allowed-in-preconfig-test.out
b/tests/qapi-schema/allowed-in-preconfig-test.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 06e30f4..608ca35 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -142,6 +142,9 @@
# Smoke test on Out-Of-Band
{ 'command': 'an-oob-command', 'allow-oob': true }
+# test allowed-in-preconfig flag
+{ 'command': 'allowed-in-preconfig-test', 'allowed-in-preconfig': true }
+
# For testing integer range flattening in opts-visitor. The following schema
# corresponds to the option format:
#
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 1f5038f..c955e2d 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -168,6 +168,8 @@ command boxed-union UserDefNativeListUnion -> None
gen=True success_response=True boxed=True oob=False preconfig=False
command an-oob-command None -> None
gen=True success_response=True boxed=False oob=True preconfig=False
+command allowed-in-preconfig-test None -> None
+ gen=True success_response=True boxed=False oob=False preconfig=True
object UserDefOptions
member i64: intList optional=True
member u64: uint64List optional=True
diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
index db690cc..730476a 100644
--- a/tests/test-qmp-cmds.c
+++ b/tests/test-qmp-cmds.c
@@ -20,6 +20,10 @@ void qmp_an_oob_command(Error **errp)
{
}
+void qmp_allowed_in_preconfig_test(Error **errp)
+{
+}
+
Empty2 *qmp_user_def_cmd0(Error **errp)
{
return g_new0(Empty2, 1);
--
2.7.4
- [Qemu-devel] [PATCH v6 00/11] enable numa configuration before machine_init() from QMP, Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 07/11] tests: add allowed-in-preconfig-test for qapi-schema,
Igor Mammedov <=
- [Qemu-devel] [PATCH v6 11/11] tests: functional tests for QMP command set-numa-node, Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 01/11] numa: postpone options post-processing till machine_run_board_init(), Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 08/11] tests: extend qmp test with preconfig checks, Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 04/11] hmp: disable monitor in preconfig state, Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 10/11] qmp: add set-numa-node command, Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 09/11] qmp: permit query-hotpluggable-cpus in preconfig state, Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 02/11] numa: split out NumaOptions parsing into set_numa_options(), Igor Mammedov, 2018/04/27
- [Qemu-devel] [PATCH v6 03/11] cli: add --preconfig option, Igor Mammedov, 2018/04/27