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

test: move the bdev directory up one level

Browse Source 
Change-Id: I6e291c3361b9b8529e4ad44c4bc41bdb4b3b2b47
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/404957
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Seth Howell 2018-03-22 12:43:32 -07:00 committed by Daniel Verkamp
parent b337d878ca
commit f9d5ed28ca
16 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotest.sh
View File

@ -97,7 +97,7 @@ fi
timing_enter lib
if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then
run_test test/lib/bdev/blockdev.sh
run_test test/bdev/blockdev.sh
fi
if [ $SPDK_TEST_EVENT -eq 1 ]; then

2
test/Makefile
View File

@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
# These directories contain tests.
TESTDIRS = app cpp_headers lib unit
TESTDIRS = app bdev cpp_headers lib unit
DIRS-y = $(TESTDIRS)

2
test/lib/bdev/Makefile → test/bdev/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
DIRS-y = bdevio bdevperf

0
test/lib/bdev/bdev.conf.in → test/bdev/bdev.conf.in
View File

0
test/lib/bdev/bdevio/.gitignore → test/bdev/bdevio/.gitignore vendored
View File

2
test/lib/bdev/bdevio/Makefile → test/bdev/bdevio/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
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk

0
test/lib/bdev/bdevio/bdevio.c → test/bdev/bdevio/bdevio.c
View File

0
test/lib/bdev/bdevperf/.gitignore → test/bdev/bdevperf/.gitignore vendored
View File

2
test/lib/bdev/bdevperf/Makefile → test/bdev/bdevperf/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
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk

0
test/lib/bdev/bdevperf/bdevperf.c → test/bdev/bdevperf/bdevperf.c
View File

6
test/lib/bdev/blockdev.sh → test/bdev/blockdev.sh
View File

@ -3,7 +3,7 @@
set -e
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..)
rootdir=$(readlink -f $testdir/../..)
plugindir=$rootdir/examples/bdev/fio_plugin
function run_fio()
@ -89,7 +89,7 @@ if [ -d /usr/src/fio ] && [ $SPDK_RUN_ASAN -eq 0 ]; then
fio_config_add_job $testdir/bdev.fio $b
done
run_fio --spdk_conf=./test/lib/bdev/bdev.conf
run_fio --spdk_conf=./test/bdev/bdev.conf
rm -f *.state
rm -f $testdir/bdev.fio
@ -102,7 +102,7 @@ if [ -d /usr/src/fio ] && [ $SPDK_RUN_ASAN -eq 0 ]; then
fio_config_add_job $testdir/bdev.fio $b
done
run_fio --spdk_conf=./test/lib/bdev/bdev.conf
run_fio --spdk_conf=./test/bdev/bdev.conf
rm -f *.state
rm -f $testdir/bdev.fio

0
test/lib/bdev/common.c → test/bdev/common.c
View File

0
test/lib/bdev/nbd_common.sh → test/bdev/nbd_common.sh
View File

2
test/iscsi_tgt/initiator/initiator.sh
View File

@ -40,7 +40,7 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
$rpc_py construct_target_node disk1 disk1_alias 'Malloc0:0' '1:2' 256 -d
sleep 1
trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
$rootdir/test/lib/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -s 4096 -w verify -t 5 -d 512
$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -s 4096 -w verify -t 5 -d 512
trap - SIGINT SIGTERM EXIT

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 json nvme util
DIRS-y = blobfs env event json nvme util
.PHONY: all clean $(DIRS-y)

2
test/nvmf/host/bdevperf.sh
View File

@ -36,7 +36,7 @@ $rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:
echo "[Nvme]" > $testdir/bdevperf.conf
echo " TransportID \"trtype:RDMA adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode1 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420\" Nvme0" >> $testdir/bdevperf.conf
$rootdir/test/lib/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -s 4096 -w verify -t 1
$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -s 4096 -w verify -t 1
sync
rm -rf $testdir/bdevperf.conf
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1