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

test: move iSCSI unit tests to test/unit

Browse Source 
Change-Id: Ibe282aa67de22e062de9d88c3b157c766be9dfae
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/366910
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Daniel Verkamp 2017-06-23 17:05:41 -07:00 committed by Ben Walker
parent 9fa2762711
commit 144ba3a1cb
17 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = bdev blobfs env event iscsi json nvme
DIRS-y = bdev blobfs env event json nvme
.PHONY: all clean $(DIRS-y)

1
test/lib/iscsi/pdu/.gitignore vendored
View File

@ -1 +0,0 @@
pdu

1
test/lib/iscsi/target_node/.gitignore vendored
View File

@ -1 +0,0 @@
target_node_ut

2
test/unit/lib/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = bdev blob ioat json jsonrpc log nvme nvmf scsi util
DIRS-y = bdev blob ioat iscsi json jsonrpc log nvme nvmf scsi util
.PHONY: all clean $(DIRS-y)

4
test/lib/iscsi/Makefile → test/unit/lib/iscsi/Makefile
View File

@ -31,10 +31,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = param pdu target_node
DIRS-y = iscsi.c param.c tgt_node.c
.PHONY: all clean $(DIRS-y)

0
test/lib/iscsi/common.c → test/unit/lib/iscsi/common.c
View File

1
test/unit/lib/iscsi/iscsi.c/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
iscsi_ut

8
test/lib/iscsi/pdu/Makefile → test/unit/lib/iscsi/iscsi.c/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
@ -43,12 +43,12 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
LIBS += -lcunit -lcrypto
SCSI_OBJS = port
ISCSI_OBJS = iscsi crc32c md5 param
ISCSI_OBJS = crc32c md5 param
OBJS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)
OBJS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)
APP = pdu
C_SRCS = pdu.c
APP = iscsi_ut
C_SRCS = iscsi_ut.c
all: $(APP)

2
test/lib/iscsi/pdu/pdu.c → test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
View File

@ -38,6 +38,8 @@
#include "CUnit/Basic.h"
#include "iscsi/iscsi.c"
#include "../common.c"
#include "iscsi/acceptor.h"
#include "iscsi/portal_grp.h"

0
test/lib/iscsi/param/.gitignore → test/unit/lib/iscsi/param.c/.gitignore vendored
View File

2
test/lib/iscsi/param/Makefile → test/unit/lib/iscsi/param.c/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

0
test/lib/iscsi/param/param_ut.c → test/unit/lib/iscsi/param.c/param_ut.c
View File

1
test/unit/lib/iscsi/tgt_node.c/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
tgt_node_ut

6
test/lib/iscsi/target_node/Makefile → test/unit/lib/iscsi/tgt_node.c/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
@ -43,8 +43,8 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = target_node_ut
C_SRCS = target_node_ut.c
APP = tgt_node_ut
C_SRCS = tgt_node_ut.c
all: $(APP)

0
test/lib/iscsi/target_node/target_node.conf → test/unit/lib/iscsi/tgt_node.c/tgt_node.conf
View File

0
test/lib/iscsi/target_node/target_node_ut.c → test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
View File

6
unittest.sh
View File

@ -69,9 +69,9 @@ $valgrind test/unit/lib/scsi/lun.c/lun_ut
$valgrind test/unit/lib/scsi/scsi.c/scsi_ut
$valgrind test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut
$valgrind test/lib/iscsi/param/param_ut
$valgrind test/lib/iscsi/target_node/target_node_ut test/lib/iscsi/target_node/target_node.conf
$valgrind test/lib/iscsi/pdu/pdu
$valgrind test/unit/lib/iscsi/param.c/param_ut
$valgrind test/unit/lib/iscsi/tgt_node.c/tgt_node_ut test/unit/lib/iscsi/tgt_node.c/tgt_node.conf
$valgrind test/unit/lib/iscsi/iscsi.c/iscsi_ut
$valgrind test/unit/lib/util/bit_array.c/bit_array_ut
$valgrind test/unit/lib/util/io_channel.c/io_channel_ut