From 1196deb504b4d146ce750be88cdd2517a73edfc7 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 6 Jul 2018 12:37:38 -0700 Subject: [PATCH] test: fix scan-build errors in bdev unittests. Specifically, the errors that occur in scan-build that uses clang-6.0 as a backend. Change-Id: I3922a4f65134cbd866fcb27ad9b7a75b6b7803bb Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/418229 Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System --- test/unit/lib/bdev/bdev.c/bdev_ut.c | 15 +++++++++------ test/unit/lib/bdev/mt/bdev.c/bdev_ut.c | 3 ++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index 2316cd9a3..aaaacc13e 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -432,7 +432,7 @@ open_write_test(void) /* Open bdev0 read-only. This should succeed. */ rc = spdk_bdev_open(bdev[0], false, NULL, NULL, &desc[0]); CU_ASSERT(rc == 0); - CU_ASSERT(desc[0] != NULL); + SPDK_CU_ASSERT_FATAL(desc[0] != NULL); spdk_bdev_close(desc[0]); /* @@ -452,7 +452,7 @@ open_write_test(void) /* Open bdev4 read-only. This should succeed. */ rc = spdk_bdev_open(bdev[4], false, NULL, NULL, &desc[4]); CU_ASSERT(rc == 0); - CU_ASSERT(desc[4] != NULL); + SPDK_CU_ASSERT_FATAL(desc[4] != NULL); spdk_bdev_close(desc[4]); /* @@ -461,7 +461,7 @@ open_write_test(void) */ rc = spdk_bdev_open(bdev[8], true, NULL, NULL, &desc[8]); CU_ASSERT(rc == 0); - CU_ASSERT(desc[8] != NULL); + SPDK_CU_ASSERT_FATAL(desc[8] != NULL); spdk_bdev_close(desc[8]); /* @@ -474,7 +474,7 @@ open_write_test(void) /* Open bdev4 read-only. This should succeed. */ rc = spdk_bdev_open(bdev[5], false, NULL, NULL, &desc[5]); CU_ASSERT(rc == 0); - CU_ASSERT(desc[5] != NULL); + SPDK_CU_ASSERT_FATAL(desc[5] != NULL); spdk_bdev_close(desc[5]); free_vbdev(bdev[8]); @@ -519,7 +519,8 @@ static void num_blocks_test(void) { struct spdk_bdev bdev; - struct spdk_bdev_desc *desc; + struct spdk_bdev_desc *desc = NULL; + int rc; memset(&bdev, 0, sizeof(bdev)); bdev.name = "num_blocks"; @@ -534,7 +535,9 @@ num_blocks_test(void) CU_ASSERT(spdk_bdev_notify_blockcnt_change(&bdev, 30) == 0); /* In case bdev opened */ - spdk_bdev_open(&bdev, false, NULL, NULL, &desc); + rc = spdk_bdev_open(&bdev, false, NULL, NULL, &desc); + CU_ASSERT(rc == 0); + SPDK_CU_ASSERT_FATAL(desc != NULL); /* Growing block number */ CU_ASSERT(spdk_bdev_notify_blockcnt_change(&bdev, 80) == 0); diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index 81c996e4c..7644f45a3 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -353,7 +353,8 @@ static void aborted_reset(void) { struct spdk_io_channel *io_ch[2]; - enum spdk_bdev_io_status status1, status2; + enum spdk_bdev_io_status status1 = SPDK_BDEV_IO_STATUS_PENDING, + status2 = SPDK_BDEV_IO_STATUS_PENDING; setup_test();