ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 <james.r.harris@intel.com>
Change-Id: I76ab20da2f560c7997e978fcbfe28c2a4907f759

Reviewed-on: https://review.gerrithub.io/399715
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Jim Harris 2018-02-13 08:11:12 -07:00
parent b2847368cc
commit 0db2c2ef47
8 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mk/nvme.unittest.mk
View File

@ -31,13 +31,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.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)/lib
CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/test
@ -56,7 +54,4 @@ $(APP) : $(OBJS) $(SPDK_LIB_FILES)
clean: clean:
$(CLEAN_C) $(APP) $(CLEAN_C) $(APP)
%.o: $(NVME_DIR)/%.c %.d $(MAKEFILE_LIST)
$(COMPILE_C)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

5
mk/nvmf.unittest.mk
View File

@ -34,7 +34,7 @@
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.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)/lib/nvmf
CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/test
@ -53,7 +53,4 @@ $(APP) : $(OBJS) $(SPDK_LIB_FILES)
clean: clean:
$(CLEAN_C) $(APP) $(CLEAN_C) $(APP)
%.o: $(SPDK_ROOT_DIR)/lib/nvmf/%.c %.d $(MAKEFILE_LIST)
$(COMPILE_C)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

1
test/unit/lib/nvme/nvme_ctrlr.c/Makefile
View File

@ -34,6 +34,5 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
TEST_FILE = nvme_ctrlr_ut.c TEST_FILE = nvme_ctrlr_ut.c
OTHER_FILES = nvme_quirks.c
include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk

1
test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
View File

@ -45,6 +45,7 @@ struct spdk_trace_flag SPDK_LOG_NVME = {
}; };
#include "nvme/nvme_ctrlr.c" #include "nvme/nvme_ctrlr.c"
#include "nvme/nvme_quirks.c"
struct nvme_driver _g_nvme_driver = { struct nvme_driver _g_nvme_driver = {
.lock = PTHREAD_MUTEX_INITIALIZER, .lock = PTHREAD_MUTEX_INITIALIZER,

1
test/unit/lib/nvme/nvme_ns_cmd.c/Makefile
View File

@ -34,6 +34,5 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
TEST_FILE = nvme_ns_cmd_ut.c TEST_FILE = nvme_ns_cmd_ut.c
OTHER_FILES = nvme.c
include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk

1
test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
View File

@ -34,6 +34,7 @@
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "nvme/nvme_ns_cmd.c" #include "nvme/nvme_ns_cmd.c"
#include "nvme/nvme.c"
#include "lib/test_env.c" #include "lib/test_env.c"

1
test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
View File

@ -34,6 +34,5 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
TEST_FILE = ctrlr_discovery_ut.c TEST_FILE = ctrlr_discovery_ut.c
OTHER_FILES = subsystem.c
include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk

1
test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
View File

@ -36,6 +36,7 @@
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "ctrlr_discovery.c" #include "ctrlr_discovery.c"
#include "subsystem.c"
SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF) SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)