aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/qtest/migration-test.c4
-rw-r--r--tests/qtest/npcm7xx_pwm-test.c13
-rw-r--r--tests/unit/test-io-task.c2
-rw-r--r--tests/unit/test-qmp-event.c108
4 files changed, 43 insertions, 84 deletions
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 0fbaa6a90f..d520c587f7 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -3360,9 +3360,7 @@ int main(int argc, char **argv)
qtest_add_func("/migration/bad_dest", test_baddest);
#ifndef _WIN32
- if (!g_str_equal(arch, "s390x")) {
- qtest_add_func("/migration/analyze-script", test_analyze_script);
- }
+ qtest_add_func("/migration/analyze-script", test_analyze_script);
#endif
qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain);
qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle);
diff --git a/tests/qtest/npcm7xx_pwm-test.c b/tests/qtest/npcm7xx_pwm-test.c
index ea4ca1d106..b53a43c417 100644
--- a/tests/qtest/npcm7xx_pwm-test.c
+++ b/tests/qtest/npcm7xx_pwm-test.c
@@ -606,6 +606,7 @@ static void test_toggle(gconstpointer test_data)
uint32_t ppr, csr, pcr, cnr, cmr;
int i, j, k, l;
uint64_t expected_freq, expected_duty;
+ int cnr_step = g_test_quick() ? 2 : 1;
mft_init(qts, td);
@@ -618,7 +619,7 @@ static void test_toggle(gconstpointer test_data)
csr = csr_list[j];
pwm_write_csr(qts, td, csr);
- for (k = 0; k < ARRAY_SIZE(cnr_list); ++k) {
+ for (k = 0; k < ARRAY_SIZE(cnr_list); k += cnr_step) {
cnr = cnr_list[k];
pwm_write_cnr(qts, td, cnr);
@@ -678,6 +679,7 @@ static void pwm_add_test(const char *name, const TestData* td,
int main(int argc, char **argv)
{
TestData test_data_list[ARRAY_SIZE(pwm_module_list) * ARRAY_SIZE(pwm_list)];
+ int pwm_module_list_cnt = 1, pwm_list_cnt = 1;
char *v_env = getenv("V");
@@ -687,8 +689,13 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
- for (int i = 0; i < ARRAY_SIZE(pwm_module_list); ++i) {
- for (int j = 0; j < ARRAY_SIZE(pwm_list); ++j) {
+ if (!g_test_quick()) {
+ pwm_module_list_cnt = ARRAY_SIZE(pwm_module_list);
+ pwm_list_cnt = ARRAY_SIZE(pwm_list);
+ }
+
+ for (int i = 0; i < pwm_module_list_cnt; ++i) {
+ for (int j = 0; j < pwm_list_cnt; ++j) {
TestData *td = &test_data_list[i * ARRAY_SIZE(pwm_list) + j];
td->module = &pwm_module_list[i];
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-20 14:39:22 +0000