Commit 0db2c2ef authored by Jim Harris's avatar Jim Harris
Browse files

test: remove explicit build rule from nvme/nvmf mk file 



These aren't needed - the common %.o rule is sufficient.

As part of this patch, remove OTHER_FILES references from
nvme and nvmf unit tests, and just include these .c files
directly.

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

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


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

mk/nvme.unittest.mk

+1 −6
Original line number Diff line number Diff line
@@ -31,13 +31,11 @@ 
#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme



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

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

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



C_SRCS = $(TEST_FILE) $(OTHER_FILES)

C_SRCS = $(TEST_FILE)



CFLAGS += -I$(SPDK_ROOT_DIR)/lib

CFLAGS += -I$(SPDK_ROOT_DIR)/test
@@ -56,7 +54,4 @@ $(APP) : $(OBJS) $(SPDK_LIB_FILES) 
clean:

	$(CLEAN_C) $(APP)



%.o: $(NVME_DIR)/%.c %.d $(MAKEFILE_LIST)

	$(COMPILE_C)



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

mk/nvmf.unittest.mk

+1 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

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



C_SRCS = $(TEST_FILE) $(OTHER_FILES)

C_SRCS = $(TEST_FILE)



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

CFLAGS += -I$(SPDK_ROOT_DIR)/test
@@ -53,7 +53,4 @@ $(APP) : $(OBJS) $(SPDK_LIB_FILES) 
clean:

	$(CLEAN_C) $(APP)



%.o: $(SPDK_ROOT_DIR)/lib/nvmf/%.c %.d $(MAKEFILE_LIST)

	$(COMPILE_C)



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

test/unit/lib/nvme/nvme_ctrlr.c/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -34,6 +34,5 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)



TEST_FILE = nvme_ctrlr_ut.c

OTHER_FILES = nvme_quirks.c



include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk

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

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct spdk_trace_flag SPDK_LOG_NVME = { 
};



#include "nvme/nvme_ctrlr.c"

#include "nvme/nvme_quirks.c"



struct nvme_driver _g_nvme_driver = {

	.lock = PTHREAD_MUTEX_INITIALIZER,

test/unit/lib/nvme/nvme_ns_cmd.c/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -34,6 +34,5 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)



TEST_FILE = nvme_ns_cmd_ut.c

OTHER_FILES = nvme.c



include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk