From 0db2c2ef471280224bbd584075fbc4d903d89bf8 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 13 Feb 2018 08:11:12 -0700 Subject: [PATCH] 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: Jim Harris Change-Id: I76ab20da2f560c7997e978fcbfe28c2a4907f759 Reviewed-on: https://review.gerrithub.io/399715 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp --- mk/nvme.unittest.mk | 7 +------ mk/nvmf.unittest.mk | 5 +---- test/unit/lib/nvme/nvme_ctrlr.c/Makefile | 1 - test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c | 1 + test/unit/lib/nvme/nvme_ns_cmd.c/Makefile | 1 - test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c | 1 + test/unit/lib/nvmf/ctrlr_discovery.c/Makefile | 1 - test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c | 1 + 8 files changed, 5 insertions(+), 13 deletions(-) diff --git a/mk/nvme.unittest.mk b/mk/nvme.unittest.mk index 0dfc9d8ca..f3ac5551b 100644 --- a/mk/nvme.unittest.mk +++ b/mk/nvme.unittest.mk @@ -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 diff --git a/mk/nvmf.unittest.mk b/mk/nvmf.unittest.mk index 577b95aef..235f71187 100644 --- a/mk/nvmf.unittest.mk +++ b/mk/nvmf.unittest.mk @@ -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 diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile index d289c0091..eac386ddf 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile +++ b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile @@ -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 diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c index 7abd9da7a..a21e3c07b 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c +++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c @@ -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, diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile index ab9c82650..fa2ead2ba 100644 --- a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile +++ b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile @@ -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 diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c index 1880fa904..f95b751da 100644 --- a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c +++ b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c @@ -34,6 +34,7 @@ #include "spdk_cunit.h" #include "nvme/nvme_ns_cmd.c" +#include "nvme/nvme.c" #include "lib/test_env.c" diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile b/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile index 1eaa8883a..6578cbec7 100644 --- a/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile +++ b/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile @@ -34,6 +34,5 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = ctrlr_discovery_ut.c -OTHER_FILES = subsystem.c include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c index fb2378b75..259a4c58e 100644 --- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c +++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c @@ -36,6 +36,7 @@ #include "spdk_cunit.h" #include "ctrlr_discovery.c" +#include "subsystem.c" SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)