From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Ani Sinha" <ani@anisinha.ca>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 08/15] bios-tables-test: Make oem-fields tests be consistent
Date: Tue, 20 Sep 2022 17:35:05 +0200 [thread overview]
Message-ID: <20220920153512.187283-9-thuth@redhat.com> (raw)
In-Reply-To: <20220920153512.187283-1-thuth@redhat.com>
From: Juan Quintela <quintela@redhat.com>
Every other test function is named:
test_acpi_<machine>_<test>()
Just make this test the same. Once there, rename "acpi/oem-fields" to
"acpi/piix4/oem-fields" so it is consistent with everything else.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220902173452.1904-2-quintela@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/bios-tables-test.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 36783966b0..a62f8f9c08 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1671,7 +1671,7 @@ static void test_oem_fields(test_data *data)
}
}
-static void test_acpi_oem_fields_pc(void)
+static void test_acpi_piix4_oem_fields(void)
{
test_data data;
char *args;
@@ -1691,7 +1691,7 @@ static void test_acpi_oem_fields_pc(void)
g_free(args);
}
-static void test_acpi_oem_fields_q35(void)
+static void test_acpi_q35_oem_fields(void)
{
test_data data;
char *args;
@@ -1711,7 +1711,7 @@ static void test_acpi_oem_fields_q35(void)
g_free(args);
}
-static void test_acpi_oem_fields_microvm(void)
+static void test_acpi_microvm_oem_fields(void)
{
test_data data;
char *args;
@@ -1728,7 +1728,7 @@ static void test_acpi_oem_fields_microvm(void)
g_free(args);
}
-static void test_acpi_oem_fields_virt(void)
+static void test_acpi_virt_oem_fields(void)
{
test_data data = {
.machine = "virt",
@@ -1766,13 +1766,13 @@ int main(int argc, char *argv[])
if (ret) {
return ret;
}
- qtest_add_func("acpi/q35/oem-fields", test_acpi_oem_fields_q35);
+ qtest_add_func("acpi/q35/oem-fields", test_acpi_q35_oem_fields);
if (tpm_model_is_available("-machine q35", "tpm-tis")) {
qtest_add_func("acpi/q35/tpm2-tis", test_acpi_q35_tcg_tpm2_tis);
qtest_add_func("acpi/q35/tpm12-tis", test_acpi_q35_tcg_tpm12_tis);
}
qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
- qtest_add_func("acpi/oem-fields", test_acpi_oem_fields_pc);
+ qtest_add_func("acpi/piix4/oem-fields", test_acpi_piix4_oem_fields);
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
qtest_add_func("acpi/piix4/pci-hotplug/no_root_hotplug",
test_acpi_piix4_no_root_hotplug);
@@ -1819,7 +1819,7 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg);
qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg);
qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2_tcg);
- qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_fields_microvm);
+ qtest_add_func("acpi/microvm/oem-fields", test_acpi_microvm_oem_fields);
if (has_tcg) {
qtest_add_func("acpi/q35/ivrs", test_acpi_q35_tcg_ivrs);
if (strcmp(arch, "x86_64") == 0) {
@@ -1844,7 +1844,7 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb);
- qtest_add_func("acpi/virt/oem-fields", test_acpi_oem_fields_virt);
+ qtest_add_func("acpi/virt/oem-fields", test_acpi_virt_oem_fields);
qtest_add_func("acpi/virt/viot", test_acpi_virt_viot);
}
}
--
2.31.1
next prev parent reply other threads:[~2022-09-20 19:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 15:34 [PULL 00/15] Testing, qga and misc patches Thomas Huth
2022-09-20 15:34 ` [PULL 01/15] tests: mark io-command test as skipped if socat is missing Thomas Huth
2022-09-20 15:34 ` [PULL 02/15] tests/vm: update NetBSD to 9.3 Thomas Huth
2022-09-20 15:35 ` [PULL 03/15] .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build Thomas Huth
2022-09-20 15:35 ` [PULL 04/15] tests/qtest: npcm7xx-emc-test: Skip checking MAC Thomas Huth
2022-09-20 15:35 ` [PULL 05/15] qtest/fuzz-lsi53c895a-test: set guest RAM to 2G Thomas Huth
2022-09-20 15:35 ` [PULL 06/15] tests: Fix error strings Thomas Huth
2022-09-20 15:35 ` [PULL 07/15] meson-build: Enable CONFIG_REPLICATION only when replication is set Thomas Huth
2022-09-20 15:35 ` Thomas Huth [this message]
2022-09-20 15:35 ` [PULL 09/15] bios-tables-test: Sort all x86_64 tests by machine type Thomas Huth
2022-09-20 15:35 ` [PULL 10/15] bios-tables-test: Only run test for machine types compiled in Thomas Huth
2022-09-20 15:35 ` [PULL 11/15] tests: Only run intel-hda-tests if machine type is " Thomas Huth
2022-09-20 15:35 ` [PULL 12/15] tests: sb16 has both pc and q35 tests Thomas Huth
2022-09-20 15:35 ` [PULL 13/15] gitlab-ci: Update the FreeBSD 13 job from 13.0 to 13.1 Thomas Huth
2022-09-20 15:35 ` [PULL 14/15] qga: Replace 'blacklist' command line and config file options by 'block-rpcs' Thomas Huth
2022-09-20 15:35 ` [PULL 15/15] qga: Replace 'blacklist' and 'whitelist' in the guest agent sources Thomas Huth
2022-09-21 17:33 ` [PULL 00/15] Testing, qga and misc patches Stefan Hajnoczi
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=20220920153512.187283-9-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=ani@anisinha.ca \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.