summaryrefslogtreecommitdiff
path: root/test/dm/test-driver.c
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-05-20 19:27:27 (GMT)
committerTom Rini <trini@konsulko.com>2015-05-21 13:16:16 (GMT)
commite721b882e9daf3ad3599eef5a9ccf3847b694228 (patch)
treed92fadcb65548e6ed19c60d4dfa27ecc80c3778c /test/dm/test-driver.c
parent6e0d26c0502e4d697cb235069aef188f8f1407d3 (diff)
downloadu-boot-fsl-qoriq-e721b882e9daf3ad3599eef5a9ccf3847b694228.tar.xz
test: Generalize the unit test framework
Separate the ability to define tests and assert status of test functions from the dm tests so they can be used more consistently throughout all tests. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test/dm/test-driver.c')
-rw-r--r--test/dm/test-driver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c
index bc6a6e7..d10af51 100644
--- a/test/dm/test-driver.c
+++ b/test/dm/test-driver.c
@@ -12,11 +12,11 @@
#include <errno.h>
#include <malloc.h>
#include <dm/test.h>
-#include <dm/ut.h>
+#include <test/ut.h>
#include <asm/io.h>
int dm_testdrv_op_count[DM_TEST_OP_COUNT];
-static struct dm_test_state *dms = &global_test_state;
+static struct unit_test_state *uts = &global_dm_test_state;
static int testdrv_ping(struct udevice *dev, int pingval, int *pingret)
{
@@ -114,6 +114,8 @@ static int test_manual_bind(struct udevice *dev)
static int test_manual_probe(struct udevice *dev)
{
+ struct dm_test_state *dms = uts->priv;
+
dm_testdrv_op_count[DM_TEST_OP_PROBE]++;
if (!dms->force_fail_alloc)
dev->priv = calloc(1, sizeof(struct dm_test_priv));