From: Thomas Huth <thuth@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <lvivier@redhat.com>
Subject: [PATCH 2/6] tests/qtest/readconfig: Test docs/config/ich9-ehci-uhci.cfg
Date: Tue, 28 Feb 2023 22:15:29 +0100 [thread overview]
Message-ID: <20230228211533.201837-3-thuth@redhat.com> (raw)
In-Reply-To: <20230228211533.201837-1-thuth@redhat.com>
We've got some sample config files in docs/config/ but no means
of regression checking them. Thus let's test them in our readconfig
qtest, starting with ich9-ehci-uhci.cfg. Note: To enable the test
to read the config files from the build folder, we have to install
a symlink for docs/config in the build directory.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 1 +
tests/qtest/readconfig-test.c | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/configure b/configure
index dccb5d4f96..4331fead78 100755
--- a/configure
+++ b/configure
@@ -2215,6 +2215,7 @@ fi
# tests might fail. Prefer to keep the relevant files in their own
# directory and symlink the directory instead.
LINKS="Makefile"
+LINKS="$LINKS docs/config"
LINKS="$LINKS pc-bios/optionrom/Makefile"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
LINKS="$LINKS pc-bios/vof/Makefile"
diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
index 26d79b5e4b..2160603880 100644
--- a/tests/qtest/readconfig-test.c
+++ b/tests/qtest/readconfig-test.c
@@ -177,6 +177,26 @@ static void test_object_rng(void)
qtest_quit(qts);
}
+static void test_docs_config_ich9(void)
+{
+ QTestState *qts;
+ QDict *resp;
+ QObject *qobj;
+
+ qts = qtest_initf("-nodefaults -readconfig docs/config/ich9-ehci-uhci.cfg");
+
+ resp = qtest_qmp(qts, "{ 'execute': 'qom-list',"
+ " 'arguments': {'path': '/machine/peripheral' }}");
+ qobj = qdict_get(resp, "return");
+ test_object_available(qobj, "ehci", "ich9-usb-ehci1");
+ test_object_available(qobj, "uhci-1", "ich9-usb-uhci1");
+ test_object_available(qobj, "uhci-2", "ich9-usb-uhci2");
+ test_object_available(qobj, "uhci-3", "ich9-usb-uhci3");
+ qobject_unref(resp);
+
+ qtest_quit(qts);
+}
+
int main(int argc, char *argv[])
{
const char *arch;
@@ -187,6 +207,7 @@ int main(int argc, char *argv[])
if (g_str_equal(arch, "i386") ||
g_str_equal(arch, "x86_64")) {
qtest_add_func("readconfig/x86/memdev", test_x86_memdev);
+ qtest_add_func("readconfig/x86/ich9-ehci-uhci", test_docs_config_ich9);
}
#ifdef CONFIG_SPICE
qtest_add_func("readconfig/spice", test_spice);
--
2.31.1
next prev parent reply other threads:[~2023-02-28 21:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 21:15 [PATCH 0/6] tests/qtest/readconfig: Test configs in docs/config/ Thomas Huth
2023-02-28 21:15 ` [PATCH 1/6] tests/qtest/readconfig: Rework test_object_rng_resp into a generic function Thomas Huth
2023-02-28 21:15 ` Thomas Huth [this message]
2023-02-28 21:15 ` [PATCH 3/6] docs/config: Set the "kvm" accelerator via "[accel]" section Thomas Huth
2023-02-28 21:15 ` [PATCH 4/6] tests/qtest/readconfig-test: Allow testing for arbitrary memory sizes Thomas Huth
2023-02-28 21:15 ` [PATCH 5/6] tests/qtest: Move mkimg() and have_qemu_img() from libqos to libqtest Thomas Huth
2023-02-28 21:15 ` [PATCH 6/6] tests/qtest/readconfig: Test docs/config/q35-emulated.cfg Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230228211533.201837-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).