Commit 29eb9567 authored by Jim Harris's avatar Jim Harris
Browse files

test: use spdk.unittest.mk for nvmf unit tests 



This includes removing the nvmf.unittest.mk that these
unit tests were using previously.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I3b53db0a565aee910587826b37e8b43d6a324e75

Reviewed-on: https://review.gerrithub.io/399724


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent f8ad4dca

mk/nvmf.unittest.mk

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
#

#  BSD LICENSE

#

#  Copyright (c) Intel Corporation.

#  All rights reserved.

#

#  Redistribution and use in source and binary forms, with or without

#  modification, are permitted provided that the following conditions

#  are met:

#

#    * Redistributions of source code must retain the above copyright

#      notice, this list of conditions and the following disclaimer.

#    * Redistributions in binary form must reproduce the above copyright

#      notice, this list of conditions and the following disclaimer in

#      the documentation and/or other materials provided with the

#      distribution.

#    * Neither the name of Intel Corporation nor the names of its

#      contributors may be used to endorse or promote products derived

#      from this software without specific prior written permission.

#

#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



C_SRCS = $(TEST_FILE)



CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf

CFLAGS += -I$(SPDK_ROOT_DIR)/test



SPDK_LIB_LIST = util log



LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)



APP = $(TEST_FILE:.c=)



all: $(APP)



$(APP) : $(OBJS) $(SPDK_LIB_FILES)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

test/unit/lib/nvmf/ctrlr.c/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 


TEST_FILE = ctrlr_ut.c



include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "spdk_cunit.h"

#include "spdk_internal/mock.h"



#include "ctrlr.c"

#include "nvmf/ctrlr.c"



SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)

test/unit/lib/nvmf/ctrlr_bdev.c/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 


TEST_FILE = ctrlr_bdev_ut.c



include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include "spdk_cunit.h"



#include "ctrlr_bdev.c"

#include "nvmf/ctrlr_bdev.c"





SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)