Commit 4db2eb40 authored by Jim Harris's avatar Jim Harris
Browse files

test/iscsi: add pdu test 



As part of this commit, stop building the iscsi
tests on FreeBSD.  This new pdu test links in
object files from the iscsi library, some of which
do not build currently on FreeBSD with our default
error/warning levels.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Icb6a3dc17aa62882d0477f7734d2701ea09a3f36
parent 97cc39e1

autotest.sh

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ run_test test/lib/json/json.sh 
run_test test/lib/jsonrpc/jsonrpc.sh

run_test test/lib/log/log.sh

run_test test/lib/scsi/scsi.sh

run_test test/lib/iscsi/iscsi.sh

run_test test/lib/util/util.sh



timing_exit lib
@@ -105,6 +104,8 @@ if [ $(uname -s) = Linux ]; then 
	run_test ./test/iscsi_tgt/ext4test/ext4test.sh

	run_test ./test/iscsi_tgt/rbd/rbd.sh

	timing_exit iscsi_tgt



	run_test test/lib/iscsi/iscsi.sh

fi



timing_enter nvmf

test/lib/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -34,7 +34,10 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

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



DIRS-y = bdev env event log iscsi json jsonrpc nvme nvmf scsi ioat util

DIRS-y = bdev env event log json jsonrpc nvme nvmf scsi ioat util

ifeq ($(OS),Linux)

DIRS-y += iscsi

endif



.PHONY: all clean $(DIRS-y)

test/lib/iscsi/Makefile

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

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



DIRS-y = param target_node

DIRS-y = param pdu target_node



.PHONY: all clean $(DIRS-y)

test/lib/iscsi/common.c

+7 −0
Original line number Diff line number Diff line
@@ -159,3 +159,10 @@ void 
spdk_scsi_task_set_status(struct spdk_scsi_task *task, int sc, int sk, int asc, int ascq)

{

}



void

spdk_scsi_task_set_data(struct spdk_scsi_task *task, void *data, uint32_t len)

{

	task->iovs[0].iov_base = data;

	task->iovs[0].iov_len = len;

}

test/lib/iscsi/iscsi.sh

+4 −0
Original line number Diff line number Diff line
@@ -16,4 +16,8 @@ timing_enter target_node 
$testdir/target_node/target_node_ut $testdir/target_node/target_node.conf

timing_exit target_node



timing_enter pdu

$testdir/pdu/pdu

timing_exit pdu



timing_exit iscsi