dm: test: Don't clear global_data in dm_test_uclass_before_ready()
authorSimon Glass <sjg@chromium.org>
Sun, 19 Apr 2015 13:21:02 +0000 (07:21 -0600)
committerSimon Glass <sjg@chromium.org>
Wed, 22 Apr 2015 17:15:36 +0000 (11:15 -0600)
We must not clear global_data even in tests, since the ram_buffer (which
is used by malloc()) will also be lost, and subsequent tests will fail.

Zero only the global_data fields that are required for the test to function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Tested-by: Joe Hershberger <joe.hershberger@ni.com>
test/dm/core.c

index 7f7b977972613c661dd0eeb76656f2cac8e5cdaf..91be1e5d4382d827cf1be47214f5e9d580bc19e9 100644 (file)
@@ -651,7 +651,10 @@ static int dm_test_uclass_before_ready(struct dm_test_state *dms)
 
        ut_assertok(uclass_get(UCLASS_TEST, &uc));
 
-       memset(gd, '\0', sizeof(*gd));
+       gd->dm_root = NULL;
+       gd->dm_root_f = NULL;
+       memset(&gd->uclass_root, '\0', sizeof(gd->uclass_root));
+
        ut_asserteq_ptr(NULL, uclass_find(UCLASS_TEST));
 
        return 0;