diff --git a/test/ftl/ftl.sh b/test/ftl/ftl.sh index 1723d269e..e210056d5 100755 --- a/test/ftl/ftl.sh +++ b/test/ftl/ftl.sh @@ -52,14 +52,14 @@ if [ $SPDK_TEST_FTL_EXTENDED -eq 1 ]; then run_test suite $testdir/fio.sh $device basic timing_exit fio_basic - $rootdir/test/app/bdev_svc/bdev_svc & - bdev_svc_pid=$! + $rootdir/app/spdk_tgt/spdk_tgt & + svc_pid=$! - trap "killprocess $bdev_svc_pid; exit 1" SIGINT SIGTERM EXIT + trap "killprocess $svc_pid; exit 1" SIGINT SIGTERM EXIT - waitforlisten $bdev_svc_pid + waitforlisten $svc_pid uuid=$($rpc_py construct_ftl_bdev -b nvme0 -a $device -l 0-3 | jq -r '.uuid') - killprocess $bdev_svc_pid + killprocess $svc_pid trap - SIGINT SIGTERM EXIT diff --git a/test/ftl/json.sh b/test/ftl/json.sh index 5e9fd7a0e..f4051d3cf 100755 --- a/test/ftl/json.sh +++ b/test/ftl/json.sh @@ -16,7 +16,7 @@ json_kill() { trap "json_kill; exit 1" SIGINT SIGTERM EXIT -$rootdir/test/app/bdev_svc/bdev_svc & svcpid=$! +$rootdir/app/spdk_tgt/spdk_tgt & svcpid=$! waitforlisten $svcpid # Create new bdev from json configuration diff --git a/test/ftl/restore.sh b/test/ftl/restore.sh index 0632bfc28..16ec3db54 100755 --- a/test/ftl/restore.sh +++ b/test/ftl/restore.sh @@ -26,8 +26,8 @@ restore_kill() { trap "restore_kill; exit 1" SIGINT SIGTERM EXIT -$rootdir/test/app/bdev_svc/bdev_svc & svcpid=$! -# Wait until bdev_svc starts +$rootdir/app/spdk_tgt/spdk_tgt & svcpid=$! +# Wait until spdk_tgt starts waitforlisten $svcpid if [ -n "$uuid" ]; then @@ -55,8 +55,8 @@ md5sum $mount_dir/testfile > $testdir/testfile.md5 umount $mount_dir killprocess $svcpid -$rootdir/test/app/bdev_svc/bdev_svc & svcpid=$! -# Wait until bdev_svc starts +$rootdir/app/spdk_tgt/spdk_tgt & svcpid=$! +# Wait until spdk_tgt starts waitforlisten $svcpid $rpc_py load_config < $testdir/config/ftl.json