From nobody Tue Feb 10 10:54:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580239579971284.43030505653144; Tue, 28 Jan 2020 11:26:19 -0800 (PST) Received: from localhost ([::1]:36070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwWV8-0000I7-QO for importer@patchew.org; Tue, 28 Jan 2020 14:26:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39091) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwV98-0005g7-9P for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:59:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwV95-0002Zd-FD for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:59:30 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:45426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwV95-0002Vy-5T for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:59:27 -0500 Received: by mail-wr1-x431.google.com with SMTP id a6so2515430wrx.12 for ; Tue, 28 Jan 2020 09:59:26 -0800 (PST) Received: from localhost.localdomain (93-36-56-206.ip58.fastwebnet.it. [93.36.56.206]) by smtp.gmail.com with ESMTPSA id o4sm27046968wrx.25.2020.01.28.09.59.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 09:59:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YnExb2O4ClzPUtNpSbAfghkA5v4k1iqyH6r6gUX4jdY=; b=djVDzIV0MqbRJDbAtHGs2Uuv1doEAUXEBZnaiY82DOIErylDM0ZFATA+GaUZuvVRu/ iRgnPswrLK/x6OsXpbV/hVN9T4oosbUOgncd0xbnAysAnvJtmm5FpPQiPtFxzxCIhm4l A7xheIdoYxeJPonMSWMExHTaVQYvVCfc80aZDBaHihJaLvnzd28kiBRoFnPAyK7VfeOV 11q6b+EyIG3g0sUqJw7nP/fInwfCTiTBfBlzTsLUemp+U0/GxwJBiVp94UUeClHHV4ng o+3TZlOP7y1Wnk3yfMVJxz/TtiAyX32ijCfvNM1nCj29pW7BE16T42eZSQTdNPcqqizL uLrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YnExb2O4ClzPUtNpSbAfghkA5v4k1iqyH6r6gUX4jdY=; b=ItJ7Xol/NyPbbkOBgLHqC6xdjSXfbZROdICIFMDLgQk38r+57kbT24q85e/hbkG79/ yYvy5ujGq7ShpFsA8obHhuxqZ3GMD+qeNTQEppJ2xcerXjlSOl/hlZtE0T+oSeC6Gu8J Nx3F2+RKCI4CG4J1np4030aboLcg/WP6B02XQlx4QL3lVk2CVTCgZf3oLRuJ/9b+SG9v uU8TUWWCucU7vhIL+n/uGd4fPMcpWepBmcbicBsKDpCnm8mHvfErTpNF3Iq/Otq39qVz W+vJR99Kn/0T9JgsdZdHFa8g0RAtIkxqvsS6ob9YdOGtLbj0uTl9mPCgBmnhWzWCCNdf i2dA== X-Gm-Message-State: APjAAAU0Vqvg4ABfCr/IyHGtOJLsvoUfgaa1AtEurtkqFxdcFPVfwtom l/pbx8qpISDpNAKDLKVR5grROZzc X-Google-Smtp-Source: APXvYqwQs2Mo8gUDgAFvUNOgmNStvwFZvFKxI88HXm0jW1g8d6KRnSRQgWCfn8WeO2LOtwuq4TNsPw== X-Received: by 2002:adf:e8ca:: with SMTP id k10mr28100082wrn.50.1580234363975; Tue, 28 Jan 2020 09:59:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 142/142] meson: convert check-qapi-schema Date: Tue, 28 Jan 2020 18:53:42 +0100 Message-Id: <20200128175342.9066-143-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200128175342.9066-1-pbonzini@redhat.com> References: <20200128175342.9066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" --- tests/Makefile.include | 218 +--------------------------------- tests/meson.build | 2 + tests/qapi-schema/meson.build | 214 +++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 216 deletions(-) create mode 100644 tests/qapi-schema/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index 055f86a63b..e2f9c056e3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -296,200 +296,6 @@ check-qtest-generic-y +=3D tests/machine-none-test$(E= XESUF) check-qtest-generic-y +=3D tests/qom-test$(EXESUF) check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) =20 -qapi-schema +=3D alternate-any.json -qapi-schema +=3D alternate-array.json -qapi-schema +=3D alternate-base.json -qapi-schema +=3D alternate-branch-if-invalid.json -qapi-schema +=3D alternate-clash.json -qapi-schema +=3D alternate-conflict-dict.json -qapi-schema +=3D alternate-conflict-enum-bool.json -qapi-schema +=3D alternate-conflict-enum-int.json -qapi-schema +=3D alternate-conflict-string.json -qapi-schema +=3D alternate-conflict-bool-string.json -qapi-schema +=3D alternate-conflict-num-string.json -qapi-schema +=3D alternate-empty.json -qapi-schema +=3D alternate-invalid-dict.json -qapi-schema +=3D alternate-nested.json -qapi-schema +=3D alternate-unknown.json -qapi-schema +=3D args-alternate.json -qapi-schema +=3D args-any.json -qapi-schema +=3D args-array-empty.json -qapi-schema +=3D args-array-unknown.json -qapi-schema +=3D args-bad-boxed.json -qapi-schema +=3D args-boxed-anon.json -qapi-schema +=3D args-boxed-string.json -qapi-schema +=3D args-int.json -qapi-schema +=3D args-invalid.json -qapi-schema +=3D args-member-array-bad.json -qapi-schema +=3D args-member-case.json -qapi-schema +=3D args-member-unknown.json -qapi-schema +=3D args-name-clash.json -qapi-schema +=3D args-union.json -qapi-schema +=3D args-unknown.json -qapi-schema +=3D bad-base.json -qapi-schema +=3D bad-data.json -qapi-schema +=3D bad-ident.json -qapi-schema +=3D bad-if.json -qapi-schema +=3D bad-if-empty.json -qapi-schema +=3D bad-if-empty-list.json -qapi-schema +=3D bad-if-list.json -qapi-schema +=3D bad-type-bool.json -qapi-schema +=3D bad-type-dict.json -qapi-schema +=3D bad-type-int.json -qapi-schema +=3D base-cycle-direct.json -qapi-schema +=3D base-cycle-indirect.json -qapi-schema +=3D command-int.json -qapi-schema +=3D comments.json -qapi-schema +=3D doc-bad-alternate-member.json -qapi-schema +=3D doc-bad-boxed-command-arg.json -qapi-schema +=3D doc-bad-command-arg.json -qapi-schema +=3D doc-bad-enum-member.json -qapi-schema +=3D doc-bad-event-arg.json -qapi-schema +=3D doc-bad-feature.json -qapi-schema +=3D doc-bad-section.json -qapi-schema +=3D doc-bad-symbol.json -qapi-schema +=3D doc-bad-union-member.json -qapi-schema +=3D doc-before-include.json -qapi-schema +=3D doc-before-pragma.json -qapi-schema +=3D doc-duplicated-arg.json -qapi-schema +=3D doc-duplicated-return.json -qapi-schema +=3D doc-duplicated-since.json -qapi-schema +=3D doc-empty-arg.json -qapi-schema +=3D doc-empty-section.json -qapi-schema +=3D doc-empty-symbol.json -qapi-schema +=3D doc-good.json -qapi-schema +=3D doc-interleaved-section.json -qapi-schema +=3D doc-invalid-end.json -qapi-schema +=3D doc-invalid-end2.json -qapi-schema +=3D doc-invalid-return.json -qapi-schema +=3D doc-invalid-section.json -qapi-schema +=3D doc-invalid-start.json -qapi-schema +=3D doc-missing-colon.json -qapi-schema +=3D doc-missing-expr.json -qapi-schema +=3D doc-missing-space.json -qapi-schema +=3D doc-missing.json -qapi-schema +=3D doc-no-symbol.json -qapi-schema +=3D doc-undoc-feature.json -qapi-schema +=3D double-type.json -qapi-schema +=3D duplicate-key.json -qapi-schema +=3D empty.json -qapi-schema +=3D enum-bad-member.json -qapi-schema +=3D enum-bad-name.json -qapi-schema +=3D enum-bad-prefix.json -qapi-schema +=3D enum-clash-member.json -qapi-schema +=3D enum-dict-member-unknown.json -qapi-schema +=3D enum-if-invalid.json -qapi-schema +=3D enum-int-member.json -qapi-schema +=3D enum-member-case.json -qapi-schema +=3D enum-missing-data.json -qapi-schema +=3D enum-wrong-data.json -qapi-schema +=3D event-boxed-empty.json -qapi-schema +=3D event-case.json -qapi-schema +=3D event-member-invalid-dict.json -qapi-schema +=3D event-nest-struct.json -qapi-schema +=3D features-bad-type.json -qapi-schema +=3D features-duplicate-name.json -qapi-schema +=3D features-if-invalid.json -qapi-schema +=3D features-missing-name.json -qapi-schema +=3D features-name-bad-type.json -qapi-schema +=3D features-no-list.json -qapi-schema +=3D features-unknown-key.json -qapi-schema +=3D flat-union-array-branch.json -qapi-schema +=3D flat-union-bad-base.json -qapi-schema +=3D flat-union-bad-discriminator.json -qapi-schema +=3D flat-union-base-any.json -qapi-schema +=3D flat-union-base-union.json -qapi-schema +=3D flat-union-clash-member.json -qapi-schema +=3D flat-union-discriminator-bad-name.json -qapi-schema +=3D flat-union-empty.json -qapi-schema +=3D flat-union-inline.json -qapi-schema +=3D flat-union-inline-invalid-dict.json -qapi-schema +=3D flat-union-int-branch.json -qapi-schema +=3D flat-union-invalid-branch-key.json -qapi-schema +=3D flat-union-invalid-discriminator.json -qapi-schema +=3D flat-union-invalid-if-discriminator.json -qapi-schema +=3D flat-union-no-base.json -qapi-schema +=3D flat-union-optional-discriminator.json -qapi-schema +=3D flat-union-string-discriminator.json -qapi-schema +=3D funny-char.json -qapi-schema +=3D funny-word.json -qapi-schema +=3D ident-with-escape.json -qapi-schema +=3D include-before-err.json -qapi-schema +=3D include-cycle.json -qapi-schema +=3D include-extra-junk.json -qapi-schema +=3D include-nested-err.json -qapi-schema +=3D include-no-file.json -qapi-schema +=3D include-non-file.json -qapi-schema +=3D include-repetition.json -qapi-schema +=3D include-self-cycle.json -qapi-schema +=3D include-simple.json -qapi-schema +=3D indented-expr.json -qapi-schema +=3D leading-comma-list.json -qapi-schema +=3D leading-comma-object.json -qapi-schema +=3D missing-colon.json -qapi-schema +=3D missing-comma-list.json -qapi-schema +=3D missing-comma-object.json -qapi-schema +=3D missing-type.json -qapi-schema +=3D nested-struct-data.json -qapi-schema +=3D nested-struct-data-invalid-dict.json -qapi-schema +=3D non-objects.json -qapi-schema +=3D oob-test.json -qapi-schema +=3D allow-preconfig-test.json -qapi-schema +=3D pragma-doc-required-crap.json -qapi-schema +=3D pragma-extra-junk.json -qapi-schema +=3D pragma-name-case-whitelist-crap.json -qapi-schema +=3D pragma-non-dict.json -qapi-schema +=3D pragma-unknown.json -qapi-schema +=3D pragma-returns-whitelist-crap.json -qapi-schema +=3D qapi-schema-test.json -qapi-schema +=3D quoted-structural-chars.json -qapi-schema +=3D redefined-builtin.json -qapi-schema +=3D redefined-command.json -qapi-schema +=3D redefined-event.json -qapi-schema +=3D redefined-type.json -qapi-schema +=3D reserved-command-q.json -qapi-schema +=3D reserved-enum-q.json -qapi-schema +=3D reserved-member-has.json -qapi-schema +=3D reserved-member-q.json -qapi-schema +=3D reserved-member-u.json -qapi-schema +=3D reserved-member-underscore.json -qapi-schema +=3D reserved-type-kind.json -qapi-schema +=3D reserved-type-list.json -qapi-schema +=3D returns-alternate.json -qapi-schema +=3D returns-array-bad.json -qapi-schema +=3D returns-dict.json -qapi-schema +=3D returns-unknown.json -qapi-schema +=3D returns-whitelist.json -qapi-schema +=3D string-code-point-31.json -qapi-schema +=3D string-code-point-127.json -qapi-schema +=3D struct-base-clash-deep.json -qapi-schema +=3D struct-base-clash.json -qapi-schema +=3D struct-data-invalid.json -qapi-schema +=3D struct-member-if-invalid.json -qapi-schema +=3D struct-member-invalid-dict.json -qapi-schema +=3D struct-member-invalid.json -qapi-schema +=3D trailing-comma-list.json -qapi-schema +=3D trailing-comma-object.json -qapi-schema +=3D type-bypass-bad-gen.json -qapi-schema +=3D unclosed-list.json -qapi-schema +=3D unclosed-object.json -qapi-schema +=3D unclosed-string.json -qapi-schema +=3D union-base-empty.json -qapi-schema +=3D union-base-no-discriminator.json -qapi-schema +=3D union-branch-case.json -qapi-schema +=3D union-branch-if-invalid.json -qapi-schema +=3D union-branch-invalid-dict.json -qapi-schema +=3D union-clash-branches.json -qapi-schema +=3D union-empty.json -qapi-schema +=3D union-invalid-base.json -qapi-schema +=3D union-optional-branch.json -qapi-schema +=3D union-unknown.json -qapi-schema +=3D unknown-escape.json -qapi-schema +=3D unknown-expr-key.json - - -check-qapi-schema-y :=3D $(addprefix tests/qapi-schema/, $(qapi-schema)) - generated-files-y +=3D tests/test-qapi-types.h generated-files-y +=3D tests/include/test-qapi-types-sub-module.h generated-files-y +=3D tests/test-qapi-types-sub-sub-module.h @@ -621,13 +427,6 @@ tests/test-qapi-gen-timestamp: \ @rm -f tests/test-qapi-doc.texi @>$@ =20 -tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/tests/qapi-schema/doc-go= od.json $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o tests/qapi-schema -p "doc-good-" $<, \ - "GEN","$@") - @mv tests/qapi-schema/doc-good-qapi-doc.texi $@ - @rm -f tests/qapi-schema/doc-good-qapi-*.[ch] tests/qapi-schema/doc-good-= qmp-*.[ch] - tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-events.o @@ -979,18 +778,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 -# Other tests - -.PHONY: check-tests/qapi-schema/frontend -check-tests/qapi-schema/frontend: $(addprefix $(SRC_PATH)/, $(check-qapi-s= chema-y)) - $(call quiet-command, PYTHONPATH=3D$(SRC_PATH)/scripts \ - PYTHONIOENCODING=3Dutf-8 $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-q= api.py $^, \ - TEST, check-qapi-schema) - -.PHONY: check-tests/qapi-schema/doc-good.texi -check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi - @diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $< - # Python venv for running tests =20 .PHONY: check-venv check-acceptance @@ -1030,10 +817,9 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) =20 # Consolidated targets =20 -.PHONY: check-qapi-schema check-qtest check-unit check check-clean -check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schem= a/doc-good.texi +.PHONY: check-qtest check-unit check check-clean check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) -check: check-qapi-schema check-unit check-softfloat check-qtest +check: check-unit check-qtest check-clean: rm -rf $(check-unit-y) tests/*.o rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y)) $(check-qtest-generic-y)) diff --git a/tests/meson.build b/tests/meson.build index d7402d8fa4..ba9832a6e5 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -10,3 +10,5 @@ test('decodetree', files('decode/check.sh'), if 'CONFIG_TCG' in config_host subdir('fp') endif + +subdir('qapi-schema') diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build new file mode 100644 index 0000000000..5396be15f6 --- /dev/null +++ b/tests/qapi-schema/meson.build @@ -0,0 +1,214 @@ +test_env =3D environment() +test_env.set('PYTHONPATH', meson.source_root() / 'scripts') +test_env.set('PYTHONIOENCODING', 'utf-8') + +schemas =3D [ + 'alternate-any.json', + 'alternate-array.json', + 'alternate-base.json', + 'alternate-branch-if-invalid.json', + 'alternate-clash.json', + 'alternate-conflict-dict.json', + 'alternate-conflict-enum-bool.json', + 'alternate-conflict-enum-int.json', + 'alternate-conflict-string.json', + 'alternate-conflict-bool-string.json', + 'alternate-conflict-num-string.json', + 'alternate-empty.json', + 'alternate-invalid-dict.json', + 'alternate-nested.json', + 'alternate-unknown.json', + 'args-alternate.json', + 'args-any.json', + 'args-array-empty.json', + 'args-array-unknown.json', + 'args-bad-boxed.json', + 'args-boxed-anon.json', + 'args-boxed-string.json', + 'args-int.json', + 'args-invalid.json', + 'args-member-array-bad.json', + 'args-member-case.json', + 'args-member-unknown.json', + 'args-name-clash.json', + 'args-union.json', + 'args-unknown.json', + 'bad-base.json', + 'bad-data.json', + 'bad-ident.json', + 'bad-if.json', + 'bad-if-empty.json', + 'bad-if-empty-list.json', + 'bad-if-list.json', + 'bad-type-bool.json', + 'bad-type-dict.json', + 'bad-type-int.json', + 'base-cycle-direct.json', + 'base-cycle-indirect.json', + 'command-int.json', + 'comments.json', + 'doc-bad-alternate-member.json', + 'doc-bad-boxed-command-arg.json', + 'doc-bad-command-arg.json', + 'doc-bad-enum-member.json', + 'doc-bad-event-arg.json', + 'doc-bad-feature.json', + 'doc-bad-section.json', + 'doc-bad-symbol.json', + 'doc-bad-union-member.json', + 'doc-before-include.json', + 'doc-before-pragma.json', + 'doc-duplicated-arg.json', + 'doc-duplicated-return.json', + 'doc-duplicated-since.json', + 'doc-empty-arg.json', + 'doc-empty-section.json', + 'doc-empty-symbol.json', + 'doc-good.json', + 'doc-interleaved-section.json', + 'doc-invalid-end.json', + 'doc-invalid-end2.json', + 'doc-invalid-return.json', + 'doc-invalid-section.json', + 'doc-invalid-start.json', + 'doc-missing-colon.json', + 'doc-missing-expr.json', + 'doc-missing-space.json', + 'doc-missing.json', + 'doc-no-symbol.json', + 'doc-undoc-feature.json', + 'double-type.json', + 'duplicate-key.json', + 'empty.json', + 'enum-bad-member.json', + 'enum-bad-name.json', + 'enum-bad-prefix.json', + 'enum-clash-member.json', + 'enum-dict-member-unknown.json', + 'enum-if-invalid.json', + 'enum-int-member.json', + 'enum-member-case.json', + 'enum-missing-data.json', + 'enum-wrong-data.json', + 'event-boxed-empty.json', + 'event-case.json', + 'event-member-invalid-dict.json', + 'event-nest-struct.json', + 'features-bad-type.json', + 'features-duplicate-name.json', + 'features-if-invalid.json', + 'features-missing-name.json', + 'features-name-bad-type.json', + 'features-no-list.json', + 'features-unknown-key.json', + 'flat-union-array-branch.json', + 'flat-union-bad-base.json', + 'flat-union-bad-discriminator.json', + 'flat-union-base-any.json', + 'flat-union-base-union.json', + 'flat-union-clash-member.json', + 'flat-union-discriminator-bad-name.json', + 'flat-union-empty.json', + 'flat-union-inline.json', + 'flat-union-inline-invalid-dict.json', + 'flat-union-int-branch.json', + 'flat-union-invalid-branch-key.json', + 'flat-union-invalid-discriminator.json', + 'flat-union-invalid-if-discriminator.json', + 'flat-union-no-base.json', + 'flat-union-optional-discriminator.json', + 'flat-union-string-discriminator.json', + 'funny-char.json', + 'funny-word.json', + 'ident-with-escape.json', + 'include-before-err.json', + 'include-cycle.json', + 'include-extra-junk.json', + 'include-nested-err.json', + 'include-no-file.json', + 'include-non-file.json', + 'include-repetition.json', + 'include-self-cycle.json', + 'include-simple.json', + 'indented-expr.json', + 'leading-comma-list.json', + 'leading-comma-object.json', + 'missing-colon.json', + 'missing-comma-list.json', + 'missing-comma-object.json', + 'missing-type.json', + 'nested-struct-data.json', + 'nested-struct-data-invalid-dict.json', + 'non-objects.json', + 'oob-test.json', + 'allow-preconfig-test.json', + 'pragma-doc-required-crap.json', + 'pragma-extra-junk.json', + 'pragma-name-case-whitelist-crap.json', + 'pragma-non-dict.json', + 'pragma-unknown.json', + 'pragma-returns-whitelist-crap.json', + 'qapi-schema-test.json', + 'quoted-structural-chars.json', + 'redefined-builtin.json', + 'redefined-command.json', + 'redefined-event.json', + 'redefined-type.json', + 'reserved-command-q.json', + 'reserved-enum-q.json', + 'reserved-member-has.json', + 'reserved-member-q.json', + 'reserved-member-u.json', + 'reserved-member-underscore.json', + 'reserved-type-kind.json', + 'reserved-type-list.json', + 'returns-alternate.json', + 'returns-array-bad.json', + 'returns-dict.json', + 'returns-unknown.json', + 'returns-whitelist.json', + 'string-code-point-31.json', + 'string-code-point-127.json', + 'struct-base-clash-deep.json', + 'struct-base-clash.json', + 'struct-data-invalid.json', + 'struct-member-if-invalid.json', + 'struct-member-invalid-dict.json', + 'struct-member-invalid.json', + 'trailing-comma-list.json', + 'trailing-comma-object.json', + 'type-bypass-bad-gen.json', + 'unclosed-list.json', + 'unclosed-object.json', + 'unclosed-string.json', + 'union-base-empty.json', + 'union-base-no-discriminator.json', + 'union-branch-case.json', + 'union-branch-if-invalid.json', + 'union-branch-invalid-dict.json', + 'union-clash-branches.json', + 'union-empty.json', + 'union-invalid-base.json', + 'union-optional-branch.json', + 'union-unknown.json', + 'unknown-escape.json', + 'unknown-expr-key.json', +] + +test_qapi =3D find_program('test-qapi.py') + +test('QAPI schema regression tests', test_qapi, args: files(schemas), + env: test_env, suite: ['qapi-schema', 'qapi-frontend']) + +diff =3D find_program('diff') + +qapi_doc =3D custom_target('QAPI doc', + output: 'doc-good-qapi-doc.texi', + input: files('doc-good.json'), + command: [ qapi_gen, '-o', meson.current_build_di= r(), + '-p', 'doc-good-', '@INPUT0@' ], + depend_files: qapi_gen_depends) + +test('QAPI doc', diff, args: ['-u', files('doc-good.texi'), qapi_doc], + depends: qapi_doc, + suite: ['qapi-schema', 'qapi-doc']) --=20 2.21.0