From 7cccc66af5c33b0ceb67fb9a77b82e93a734091e Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Wed, 20 May 2015 14:27:32 -0500 Subject: test: dm: Don't bail on all tests if one test fails There's not much point in having a failure count if we always give up on the first failure. Also stop clearing the entire state between tests. Make sure that any failures are still passed out to the command line. Signed-off-by: Joe Hershberger Reviewed-by: Simon Glass --- test/dm/test-main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/dm/test-main.c b/test/dm/test-main.c index a2fe176579..53c3a6ebbd 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -24,8 +24,6 @@ static int dm_test_init(struct unit_test_state *uts) { struct dm_test_state *dms = uts->priv; - memset(uts, '\0', sizeof(*uts)); - uts->priv = dms; memset(dms, '\0', sizeof(*dms)); gd->dm_root = NULL; memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count)); @@ -106,15 +104,14 @@ static int dm_test_main(const char *test_name) if (test->flags & DM_TESTF_SCAN_FDT) ut_assertok(dm_scan_fdt(gd->fdt_blob, false)); - if (test->func(uts)) - break; + test->func(uts); ut_assertok(dm_test_destroy(uts)); } printf("Failures: %d\n", uts->fail_count); - return 0; + return uts->fail_count ? CMD_RET_FAILURE : 0; } int do_ut_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -- cgit v1.2.1