[U-Boot] [PATCH 5/5] dm: test: Don't clear global_data in dm_test_uclass_before_ready()

Simon Glass sjg at chromium.org
Sun Apr 19 15:21:02 CEST 2015


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 at chromium.org>
---

 test/dm/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/dm/core.c b/test/dm/core.c
index 990d390..4b9c987 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -596,12 +596,14 @@ 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;
 }
-
 DM_TEST(dm_test_uclass_before_ready, 0);
 
 static int dm_test_device_get_uclass_id(struct dm_test_state *dms)
-- 
2.2.0.rc0.207.ga3a616c



More information about the U-Boot mailing list