diff --git a/test/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh index 0051df1d1..bf53cc6eb 100755 --- a/test/nvme/spdk_nvme_cli.sh +++ b/test/nvme/spdk_nvme_cli.sh @@ -36,7 +36,7 @@ bdf=$(echo $bdfs|awk '{ print $1 }') cd $spdk_nvme_cli make clean && make -j$(nproc) LDFLAGS="$(make -s -C $spdk_nvme_cli/spdk ldflags)" sed -i 's/spdk=0/spdk=1/g' spdk.conf -sed -i 's/shm_id=1/shm_id=0/g' spdk.conf +sed -i 's/shm_id=.*/shm_id=0/g' spdk.conf ./nvme list ./nvme id-ctrl $bdf ./nvme list-ctrl $bdf diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh index c8b40794e..6039b97a5 100755 --- a/test/nvmf/nvme_cli/nvme_cli.sh +++ b/test/nvmf/nvme_cli/nvme_cli.sh @@ -74,6 +74,7 @@ nvme disconnect -n "nqn.2016-06.io.spdk:cnode2" || true if [ -d $spdk_nvme_cli ]; then # Test spdk/nvme-cli NVMe-oF commands: discover, connect and disconnect cd $spdk_nvme_cli + sed -i 's/shm_id=.*/shm_id=-1/g' spdk.conf ./nvme discover -t rdma -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT" nvme_num_before_connection=$(nvme list |grep "/dev/nvme*"|awk '{print $1}'|wc -l) ./nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"