[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/12] test-qdev-global-props: Run tests on subproces
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/12] test-qdev-global-props: Run tests on subprocess |
Date: |
Sun, 14 Sep 2014 21:41:23 +0300 |
From: Eduardo Habkost <address@hidden>
There are multiple reasons for running the global property tests on a
subprocess:
* We need the global_props lists to be empty for each test case, so
global properties from the previous test won't affect the next one;
* We don't want the qdev_prop_check_global() warnings to pollute test
output;
* With a subprocess, we can ensure qdev_prop_check_global() is printing
the warning messages it should.
Signed-off-by: Eduardo Habkost <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/test-qdev-global-props.c | 49 ++++++++++++++++++++++++++++++++++++------
1 file changed, 43 insertions(+), 6 deletions(-)
diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c
index e1a1317..34223a7 100644
--- a/tests/test-qdev-global-props.c
+++ b/tests/test-qdev-global-props.c
@@ -65,7 +65,7 @@ static const TypeInfo static_prop_type = {
};
/* Test simple static property setting to default value */
-static void test_static_prop(void)
+static void test_static_prop_subprocess(void)
{
MyType *mt;
@@ -75,8 +75,16 @@ static void test_static_prop(void)
g_assert_cmpuint(mt->prop1, ==, PROP_DEFAULT);
}
+static void test_static_prop(void)
+{
+ g_test_trap_subprocess("/qdev/properties/static/default/subprocess", 0, 0);
+ g_test_trap_assert_passed();
+ g_test_trap_assert_stderr("");
+ g_test_trap_assert_stdout("");
+}
+
/* Test setting of static property using global properties */
-static void test_static_globalprop(void)
+static void test_static_globalprop_subprocess(void)
{
MyType *mt;
static GlobalProperty props[] = {
@@ -93,6 +101,14 @@ static void test_static_globalprop(void)
g_assert_cmpuint(mt->prop2, ==, PROP_DEFAULT);
}
+static void test_static_globalprop(void)
+{
+ g_test_trap_subprocess("/qdev/properties/static/global/subprocess", 0, 0);
+ g_test_trap_assert_passed();
+ g_test_trap_assert_stderr("");
+ g_test_trap_assert_stdout("");
+}
+
#define TYPE_DYNAMIC_PROPS "dynamic-prop-type"
#define DYNAMIC_TYPE(obj) \
OBJECT_CHECK(MyType, (obj), TYPE_DYNAMIC_PROPS)
@@ -144,7 +160,7 @@ static const TypeInfo dynamic_prop_type = {
};
/* Test setting of dynamic properties using global properties */
-static void test_dynamic_globalprop(void)
+static void test_dynamic_globalprop_subprocess(void)
{
MyType *mt;
static GlobalProperty props[] = {
@@ -166,6 +182,16 @@ static void test_dynamic_globalprop(void)
g_assert_cmpuint(all_used, ==, 1);
}
+static void test_dynamic_globalprop(void)
+{
+ g_test_trap_subprocess("/qdev/properties/dynamic/global/subprocess", 0, 0);
+ g_test_trap_assert_passed();
+ g_test_trap_assert_stderr_unmatched("*prop1*");
+ g_test_trap_assert_stderr_unmatched("*prop2*");
+ g_test_trap_assert_stderr("*Warning: \"-global
dynamic-prop-type-bad.prop3=103\" not used\n*");
+ g_test_trap_assert_stdout("");
+}
+
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
@@ -174,9 +200,20 @@ int main(int argc, char **argv)
type_register_static(&static_prop_type);
type_register_static(&dynamic_prop_type);
- g_test_add_func("/qdev/properties/static/default", test_static_prop);
- g_test_add_func("/qdev/properties/static/global", test_static_globalprop);
- g_test_add_func("/qdev/properties/dynamic/global",
test_dynamic_globalprop);
+ g_test_add_func("/qdev/properties/static/default/subprocess",
+ test_static_prop_subprocess);
+ g_test_add_func("/qdev/properties/static/default",
+ test_static_prop);
+
+ g_test_add_func("/qdev/properties/static/global/subprocess",
+ test_static_globalprop_subprocess);
+ g_test_add_func("/qdev/properties/static/global",
+ test_static_globalprop);
+
+ g_test_add_func("/qdev/properties/dynamic/global/subprocess",
+ test_dynamic_globalprop_subprocess);
+ g_test_add_func("/qdev/properties/dynamic/global",
+ test_dynamic_globalprop);
g_test_run();
--
MST
[Qemu-devel] [PULL 04/12] test-qdev-global-props: Initialize not_used=true for all props, Michael S. Tsirkin, 2014/09/14
[Qemu-devel] [PULL 05/12] test-qdev-global-props: Test handling of hotpluggable and non-device types, Michael S. Tsirkin, 2014/09/14
[Qemu-devel] [PULL 06/12] qdev: Rename qdev_prop_check_global() to qdev_prop_check_globals(), Michael S. Tsirkin, 2014/09/14
[Qemu-devel] [PULL 07/12] qdev: Move global validation to a single function, Michael S. Tsirkin, 2014/09/14
[Qemu-devel] [PULL 08/12] Revert "rng-egd: remove redundant free", Michael S. Tsirkin, 2014/09/14