diff options
| -rw-r--r-- | stubs/vmstate.c | 5 | ||||
| -rw-r--r-- | tests/Makefile.include | 5 | ||||
| -rw-r--r-- | tests/ptimer-test-stubs.c | 7 | ||||
| -rw-r--r-- | tests/ptimer-test.c | 22 |
4 files changed, 21 insertions, 18 deletions
diff --git a/stubs/vmstate.c b/stubs/vmstate.c index 94b831e219..65906271d2 100644 --- a/stubs/vmstate.c +++ b/stubs/vmstate.c @@ -3,11 +3,6 @@ #include "migration/vmstate.h" const VMStateDescription vmstate_dummy = {}; -const VMStateInfo vmstate_info_uint8; -const VMStateInfo vmstate_info_uint32; -const VMStateInfo vmstate_info_uint64; -const VMStateInfo vmstate_info_int64; -const VMStateInfo vmstate_info_timer; int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, diff --git a/tests/Makefile.include b/tests/Makefile.include index 33ea83e499..cbe38adc32 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -116,6 +116,8 @@ check-unit-$(CONFIG_REPLICATION) += tests/test-replication$(EXESUF) check-unit-y += tests/test-bufferiszero$(EXESUF) gcov-files-check-bufferiszero-y = util/bufferiszero.c check-unit-y += tests/test-uuid$(EXESUF) +check-unit-y += tests/ptimer-test$(EXESUF) +gcov-files-ptimer-test-y = hw/core/ptimer.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh @@ -307,7 +309,6 @@ check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) check-qtest-s390x-y = tests/boot-serial-test$(EXESUF) check-qtest-generic-y += tests/qom-test$(EXESUF) -check-qtest-generic-y += tests/ptimer-test$(EXESUF) qapi-schema += alternate-any.json qapi-schema += alternate-array.json @@ -515,6 +516,7 @@ tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \ $(test-util-obj-y) tests/test-base64$(EXESUF): tests/test-base64.o \ libqemuutil.a libqemustub.a +tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o libqemustub.a tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) @@ -677,7 +679,6 @@ tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-ob tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y) tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) tests/migration/stress$(EXESUF): tests/migration/stress.o diff --git a/tests/ptimer-test-stubs.c b/tests/ptimer-test-stubs.c index 92a22fbb09..e028a81a29 100644 --- a/tests/ptimer-test-stubs.c +++ b/tests/ptimer-test-stubs.c @@ -11,9 +11,16 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "sysemu/replay.h" +#include "migration/vmstate.h" #include "ptimer-test.h" +const VMStateInfo vmstate_info_uint8; +const VMStateInfo vmstate_info_uint32; +const VMStateInfo vmstate_info_uint64; +const VMStateInfo vmstate_info_int64; +const VMStateInfo vmstate_info_timer; + struct QEMUBH { QEMUBHFunc *cb; void *opaque; diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index f207eeb0eb..7b0ddf64e0 100644 --- a/tests/ptimer-test.c +++ b/tests/ptimer-test.c @@ -505,47 +505,47 @@ static void add_ptimer_tests(uint8_t policy) g_sprintf(policy_name, "default"); } - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/set_count policy=%s", policy_name), ppolicy, check_set_count); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/set_limit policy=%s", policy_name), ppolicy, check_set_limit); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/oneshot policy=%s", policy_name), ppolicy, check_oneshot); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/periodic policy=%s", policy_name), ppolicy, check_periodic); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/on_the_fly_mode_change policy=%s", policy_name), ppolicy, check_on_the_fly_mode_change); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/on_the_fly_period_change policy=%s", policy_name), ppolicy, check_on_the_fly_period_change); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/on_the_fly_freq_change policy=%s", policy_name), ppolicy, check_on_the_fly_freq_change); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/run_with_period_0 policy=%s", policy_name), ppolicy, check_run_with_period_0); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/run_with_delta_0 policy=%s", policy_name), ppolicy, check_run_with_delta_0); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/periodic_with_load_0 policy=%s", policy_name), ppolicy, check_periodic_with_load_0); - qtest_add_data_func( + g_test_add_data_func( g_strdup_printf("/ptimer/oneshot_with_load_0 policy=%s", policy_name), ppolicy, check_oneshot_with_load_0); } |