d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

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

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

56
mk/nvmf.unittest.mk
View File

@ -1,56 +0,0 @@
#
# 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

2
test/unit/lib/nvmf/ctrlr.c/Makefile
View File

@ -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

2
test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
View File

@ -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)

2
test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
View File

@ -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

2
test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
View File

@ -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)

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

@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
TEST_FILE = ctrlr_discovery_ut.c
include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

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

@ -35,8 +35,8 @@
#include "spdk_cunit.h"
#include "ctrlr_discovery.c"
#include "subsystem.c"
#include "nvmf/ctrlr_discovery.c"
#include "nvmf/subsystem.c"
SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)

2
test/unit/lib/nvmf/request.c/Makefile
View File

@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
TEST_FILE = request_ut.c
include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

2
test/unit/lib/nvmf/request.c/request_ut.c
View File

@ -35,7 +35,7 @@
#include "spdk_cunit.h"
#include "request.c"
#include "nvmf/request.c"
SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)

2
test/unit/lib/nvmf/subsystem.c/Makefile
View File

@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
TEST_FILE = subsystem_ut.c
include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

2
test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
View File

@ -35,7 +35,7 @@
#include "spdk_cunit.h"
#include "subsystem.c"
#include "nvmf/subsystem.c"
SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)