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

test/ftl: Changed bdev_svc usage to spdk_tgt

Browse Source 
Changed all ftl tests to use spdk_tgt instead.

Signed-off-by: Mateusz Kozlowski <mateusz.kozlowski@intel.com>
Change-Id: Ibb19b233f5cb855e1b6edb41145890e5b103493c
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461213
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Mateusz Kozlowski 2019-07-10 11:38:49 +02:00 committed by Darek Stojaczyk
parent e394fb3bed
commit 5094302f5a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/ftl/ftl.sh
View File

@ -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

2
test/ftl/json.sh
View File

@ -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

8
test/ftl/restore.sh
View File

@ -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