aboutsummaryrefslogtreecommitdiff
path: root/tests/unit
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2023-12-20 09:40:15 -0500
committerStefan Hajnoczi <stefanha@redhat.com>2023-12-20 09:40:16 -0500
commit191710c221f65b1542f6ea7fa4d30dde6e134fd7 (patch)
tree5d4dc2032627e2a989dbf525678568bb0251fe89 /tests/unit
parent63d663251249c247c7c1de0e3de6cf617e2a1705 (diff)
parent17b2ecc331eab274d448446aa51883040f9185ed (diff)
Merge tag 'pull-request-2023-12-20' of https://gitlab.com/thuth/qemu into staging
* Add compat machines for QEMU 9.0 * Some header clean-ups by Philippe * Restrict type names to alphanumerical range (and a few special characters) * Fix analyze-migration.py script on s390x * Clean up and improve some tests * Document handling of commas in CLI options parameters # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmWCtYsRHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbWLnw//cNJrxG0V+j0iakX+C7HRumVrLBDI4KYY # Cp2Hx92SyeQ0Kk8DJS6JueTV0SLjMsV77APu2YPH7ELmPlk+CB9gqmV7xVoYNvsm # QbRPlIjFw8MHLekadc2A+C+pn48tWACoOdBEDIfazKrxybnf0B57RC/fIfMKHjbs # 2ALCoFbbgphs7yWuzTHK8ayKaGMhUVkWfzHQwpnq899olHyZBhkl951uKJA6VmLx # KvggePkpszLjmmXA8MH1hDCcizki31cB0ZKTbQFCyE42s2S3Hvg0GueU90O7Y1cj # lS5tPVQxyEhUYMLL+/hudlf2OYqVn2BalB7ieUQIy6rG8yoc9zxfIKQi0ccl+2oA # s8HRq5S0bSjtilQogU1LQL/Gk6W1/N9MmnhKvCGB+BTK5KX7s4EQk02y9gGZm/8s # pMErMyaXTG4dLiTAK42VgMVDqCYvzBmE+Gj91OmoUR7fb+VMrsWxeBFxMPDn+VtL # TMJegIFsjw2QCSitcU4v+nP0qtKgXGbuZtrGXKabrxH5PmeQFJDSM7TwpTK4qvjK # QMIQKBbz8BfJnUzN8qAaaJEpp1T5tcMJClKtfcgxq/+VyaSaHLmD0cljqBC+g+y7 # FTo+fa7oYx44sAlqapdEXBSGn4T+J26iuCef13CCCiPfYBv/tk3b2E0AWHj4y58I # +VpInjUaPBQ= # =TA1/ # -----END PGP SIGNATURE----- # gpg: Signature made Wed 20 Dec 2023 04:36:11 EST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2023-12-20' of https://gitlab.com/thuth/qemu: tests/unit/test-qmp-event: Replace fixture by global variables tests/unit/test-qmp-event: Simplify event emission check tests/unit/test-qmp-event: Drop superfluous mutex tests/qtest/npcm7xx_pwm-test: Only do full testing in slow mode qemu-options: Clarify handling of commas in options parameters tests/qtest/migration-test: Fix analyze-migration.py for s390x qom/object: Limit type names to alphanumerical and some few special characters tests/unit/test-io-task: Rename "qemu:dummy" to avoid colon in the name memory: Remove "qemu:" prefix from the "qemu:ram-discard-manager" type name hw: Replace anti-social QOM type names (again) docs/system/arm: Fix for rename of type "xlnx.bbram-ctrl" target: Restrict 'sysemu/reset.h' to system emulation hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header system/qtest: Restrict QTest API to system emulation system/qtest: Include missing 'hw/core/cpu.h' header MAINTAINERS: Add some more vmware-related files to the corresponding section hw: Add compat machines for 9.0 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/test-io-task.c2
-rw-r--r--tests/unit/test-qmp-event.c108
2 files changed, 32 insertions, 78 deletions
diff --git a/tests/unit/test-io-task.c b/tests/unit/test-io-task.c
index 953a50ae66..115dba8970 100644
--- a/tests/unit/test-io-task.c
+++ b/tests/unit/test-io-task.c
@@ -25,7 +25,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
-#define TYPE_DUMMY "qemu:dummy"
+#define TYPE_DUMMY "qemu-dummy"
typedef struct DummyObject DummyObject;
typedef struct DummyObjectClass DummyObjectClass;
diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c
index 3626d2372f..08e95a382b 100644
--- a/tests/unit/test-qmp-event.c
+++ b/tests/unit/test-qmp-event.c
@@ -24,19 +24,15 @@
#include "test-qapi-events.h"
#include "test-qapi-emit-events.h"
-typedef struct TestEventData {
- QDict *expect;
- bool emitted;
-} TestEventData;
-
-TestEventData *test_event_data;
-static GMutex test_event_lock;
+static QDict *expected_event;
void test_qapi_event_emit(test_QAPIEvent event, QDict *d)
{
QDict *t;
int64_t s, ms;
+ g_assert(expected_event);
+
/* Verify that we have timestamp, then remove it to compare other fields */
t = qdict_get_qdict(d, "timestamp");
g_assert(t);
@@ -52,71 +48,38 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *d)
qdict_del(d, "timestamp");
- g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(test_event_data->expect)));
- test_event_data->emitted = true;
-}
-
-static void event_prepare(TestEventData *data,
- const void *unused)
-{
- /* Global variable test_event_data was used to pass the expectation, so
- test cases can't be executed at same time. */
- g_mutex_lock(&test_event_lock);
- test_event_data = data;
-}
-
-static void event_teardown(TestEventData *data,
- const void *unused)
-{
- test_event_data = NULL;
- g_mutex_unlock(&test_event_lock);
+ g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(expected_event)));
+ qobject_unref(expected_event);
+ expected_event = NULL;
}
-static void event_test_add(const char *testpath,
- void (*test_func)(TestEventData *data,
- const void *user_data))
+static void test_event_a(void)
{
- g_test_add(testpath, TestEventData, NULL, event_prepare, test_func,
- event_teardown);
-}
-
-
-/* Test cases */
-
-static void test_event_a(TestEventData *data,
- const void *unused)
-{
- data->expect = qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }");
+ expected_event = qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }");
qapi_event_send_event_a();
- g_assert(data->emitted);
- qobject_unref(data->expect);
+ g_assert(!expected_event);
}
-static void test_event_b(TestEventData *data,
- const void *unused)
+static void test_event_b(void)
{
- data->expect = qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }");
+ expected_event = qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }");
qapi_event_send_event_b();
- g_assert(data->emitted);
- qobject_unref(data->expect);
+ g_assert(!expected_event);
}
-static void test_event_c(TestEventData *data,
- const void *unused)
+static void test_event_c(void)
{
UserDefOne b = { .integer = 2, .string = (char *)"test1" };
- data->expect = qdict_from_jsonf_nofail(
+ expected_event = qdict_from_jsonf_nofail(
"{ 'event': 'EVENT_C', 'data': {"
" 'a': 1, 'b': { 'integer': 2, 'string': 'test1' }, 'c': 'test2' } }");
qapi_event_send_event_c(true, 1, &b, "test2");
- g_assert(data->emitted);
- qobject_unref(data->expect);
+ g_assert(!expected_event);
}
/* Complex type */
-static void test_event_d(TestEventData *data,
- const void *unused)
+static void test_event_d(void)
{
UserDefOne struct1 = {
.integer = 2, .string = (char *)"test1",
@@ -129,65 +92,56 @@ static void test_event_d(TestEventData *data,
.enum2 = ENUM_ONE_VALUE2,
};
- data->expect = qdict_from_jsonf_nofail(
+ expected_event = qdict_from_jsonf_nofail(
"{ 'event': 'EVENT_D', 'data': {"
" 'a': {"
" 'struct1': { 'integer': 2, 'string': 'test1', 'enum1': 'value1' },"
" 'string': 'test2', 'enum2': 'value2' },"
" 'b': 'test3', 'enum3': 'value3' } }");
qapi_event_send_event_d(&a, "test3", NULL, true, ENUM_ONE_VALUE3);
- g_assert(data->emitted);
- qobject_unref(data->expect);
+ g_assert(!expected_event);
}
-static void test_event_deprecated(TestEventData *data, const void *unused)
+static void test_event_deprecated(void)
{
- data->expect = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES1' }");
+ expected_event = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES1' }");
memset(&compat_policy, 0, sizeof(compat_policy));
qapi_event_send_test_event_features1();
- g_assert(data->emitted);
+ g_assert(!expected_event);
compat_policy.has_deprecated_output = true;
compat_policy.deprecated_output = COMPAT_POLICY_OUTPUT_HIDE;
- data->emitted = false;
qapi_event_send_test_event_features1();
- g_assert(!data->emitted);
-
- qobject_unref(data->expect);
}
-static void test_event_deprecated_data(TestEventData *data, const void *unused)
+static void test_event_deprecated_data(void)
{
memset(&compat_policy, 0, sizeof(compat_policy));
- data->expect = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0',"
+ expected_event = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0',"
" 'data': { 'foo': 42 } }");
qapi_event_send_test_event_features0(42);
- g_assert(data->emitted);
+ g_assert(!expected_event);
- qobject_unref(data->expect);
compat_policy.has_deprecated_output = true;
compat_policy.deprecated_output = COMPAT_POLICY_OUTPUT_HIDE;
- data->expect = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0' }");
+ expected_event = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0' }");
qapi_event_send_test_event_features0(42);
- g_assert(data->emitted);
-
- qobject_unref(data->expect);
}
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
- event_test_add("/event/event_a", test_event_a);
- event_test_add("/event/event_b", test_event_b);
- event_test_add("/event/event_c", test_event_c);
- event_test_add("/event/event_d", test_event_d);
- event_test_add("/event/deprecated", test_event_deprecated);
- event_test_add("/event/deprecated_data", test_event_deprecated_data);
+ g_test_add_func("/event/event_a", test_event_a);
+ g_test_add_func("/event/event_b", test_event_b);
+ g_test_add_func("/event/event_c", test_event_c);
+ g_test_add_func("/event/event_d", test_event_d);
+ g_test_add_func("/event/deprecated", test_event_deprecated);
+ g_test_add_func("/event/deprecated_data", test_event_deprecated_data);
g_test_run();
return 0;
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-22 04:01:37 +0000