diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-12 15:57:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-12 15:57:20 -0500 |
| commit | c57ec2c2bab00c02a457ca70624c1333c60c2ec0 (patch) | |
| tree | 8b8b53585fd9bc655f32eba141f3c2d25d21d882 /test/dm/test-uclass.c | |
| parent | 668866aa24a87244e64be42f296959297ddc5014 (diff) | |
| parent | fc3283314539d6c3fb577359f6cb364c19c13726 (diff) | |
Merge branch '2021-03-12-test-improvements' into next
- Assorted improvements to the pytest framework
Diffstat (limited to 'test/dm/test-uclass.c')
| -rw-r--r-- | test/dm/test-uclass.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index f1b7aaa727..067701734a 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -17,8 +17,6 @@ #include <test/test.h> #include <test/ut.h> -static struct unit_test_state *uts = &global_dm_test_state; - int test_ping(struct udevice *dev, int pingval, int *pingret) { const struct test_ops *ops = device_get_ops(dev); @@ -31,6 +29,7 @@ int test_ping(struct udevice *dev, int pingval, int *pingret) static int test_post_bind(struct udevice *dev) { + struct unit_test_state *uts = test_get_state(); struct dm_test_perdev_uc_pdata *uc_pdata; dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++; @@ -56,6 +55,7 @@ static int test_pre_unbind(struct udevice *dev) static int test_pre_probe(struct udevice *dev) { struct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev); + struct unit_test_state *uts = test_get_state(); dm_testdrv_op_count[DM_TEST_OP_PRE_PROBE]++; ut_assert(priv); @@ -66,18 +66,18 @@ static int test_pre_probe(struct udevice *dev) static int test_post_probe(struct udevice *dev) { + struct unit_test_state *uts = test_get_state(); struct udevice *prev = list_entry(dev->uclass_node.prev, struct udevice, uclass_node); struct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev); struct uclass *uc = dev->uclass; - struct dm_test_state *dms = uts->priv; dm_testdrv_op_count[DM_TEST_OP_POST_PROBE]++; ut_assert(priv); ut_assert(device_active(dev)); priv->base_add = 0; - if (dms->skip_post_probe) + if (uts->skip_post_probe) return 0; if (&prev->uclass_node != &uc->dev_head) { struct dm_test_uclass_perdev_priv *prev_uc_priv @@ -101,6 +101,8 @@ static int test_pre_remove(struct udevice *dev) static int test_init(struct uclass *uc) { + struct unit_test_state *uts = test_get_state(); + dm_testdrv_op_count[DM_TEST_OP_INIT]++; ut_assert(uclass_get_priv(uc)); |