Commit 5f844a04 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme/utest: add SPDK_CU_ASSERT_FATAL wrapper 



The normal CU_ASSERT_FATAL macro calls a function that is not marked as
noreturn, so static analyzers (e.g. scan-buid) can't figure out that
fatal asserts are really fatal.

Add a wrapper macro that calls abort(), which the analyzer can determine
does not return.

Change-Id: I0c087bf9c8d3c272bf88120caa70e87dab6d9546
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 0c703940

mk/nvme.unittest.mk

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 
C_SRCS = $(TEST_FILE) $(OTHER_FILES)



CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/nvme/unit/nvme_impl.h

CFLAGS += -I$(SPDK_ROOT_DIR)/test



LIBS += -lcunit -lpthread

test/lib/nvme/unit/nvme_c/nvme_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "CUnit/Basic.h"

#include "spdk_cunit.h"



#include "nvme/nvme.c"

test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "CUnit/Basic.h"

#include "spdk_cunit.h"



#include "nvme/nvme_ctrlr.c"

test/lib/nvme/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "CUnit/Basic.h"

#include "spdk_cunit.h"



#include "nvme/nvme_ctrlr_cmd.c"

test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c

+7 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "CUnit/Basic.h"

#include "spdk_cunit.h"



#include "nvme/nvme_ns_cmd.c"
@@ -122,7 +122,7 @@ split_test(void) 
	rc = nvme_ns_cmd_read(&ns, payload, lba, lba_count, NULL, NULL);



	CU_ASSERT(rc == 0);

	CU_ASSERT_FATAL(g_request != NULL);

	SPDK_CU_ASSERT_FATAL(g_request != NULL);



	CU_ASSERT(g_request->num_children == 0);

	nvme_cmd_interpret_rw(&g_request->cmd, &cmd_lba, &cmd_lba_count);
@@ -158,7 +158,7 @@ split_test2(void) 
	rc = nvme_ns_cmd_read(&ns, payload, lba, lba_count, NULL, NULL);



	CU_ASSERT(rc == 0);

	CU_ASSERT_FATAL(g_request != NULL);

	SPDK_CU_ASSERT_FATAL(g_request != NULL);



	CU_ASSERT(g_request->num_children == 2);
@@ -213,9 +213,9 @@ split_test3(void) 
	rc = nvme_ns_cmd_read(&ns, payload, lba, lba_count, NULL, NULL);



	CU_ASSERT(rc == 0);

	CU_ASSERT_FATAL(g_request != NULL);

	SPDK_CU_ASSERT_FATAL(g_request != NULL);



	CU_ASSERT_FATAL(g_request->num_children == 2);

	SPDK_CU_ASSERT_FATAL(g_request->num_children == 2);



	child = TAILQ_FIRST(&g_request->children);

	TAILQ_REMOVE(&g_request->children, child, child_tailq);
@@ -270,9 +270,9 @@ split_test4(void) 
	rc = nvme_ns_cmd_read(&ns, payload, lba, lba_count, NULL, NULL);



	CU_ASSERT(rc == 0);

	CU_ASSERT_FATAL(g_request != NULL);

	SPDK_CU_ASSERT_FATAL(g_request != NULL);



	CU_ASSERT_FATAL(g_request->num_children == 3);

	SPDK_CU_ASSERT_FATAL(g_request->num_children == 3);



	child = TAILQ_FIRST(&g_request->children);

	TAILQ_REMOVE(&g_request->children, child, child_tailq);