From 4de69f551cb345ac16bc6cb561aeab330109e96c Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 15 May 2019 16:10:30 -0700 Subject: [PATCH] test/nvmf: run filesystem.sh against just 1 malloc bdev Adding the second bdev doesn't provide any real value since it's the same kind of bdev. While here, explicitly name the malloc bdev to simplify the test some more. Signed-off-by: Jim Harris Change-Id: Ide6da901d4b90383cc73fa195b5a070a8eda0d01 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454687 Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Reviewed-by: Seth Howell Reviewed-by: Paul Luse Tested-by: SPDK CI Jenkins --- test/nvmf/target/filesystem.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh index 35690e689..3c3132ce8 100755 --- a/test/nvmf/target/filesystem.sh +++ b/test/nvmf/target/filesystem.sh @@ -23,19 +23,14 @@ for incapsule in 0 4096; do $rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 -c $incapsule - bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" - bdevs+=" $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" - + $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 - for bdev in $bdevs; do - $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev - done + $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc1 $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s 4420 nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" waitforblk "nvme0n1" - waitforblk "nvme0n2" mkdir -p /mnt/device