From ac2dd4b2c291399364038207f6a5b04b1c996528 Mon Sep 17 00:00:00 2001
From: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Date: Thu, 7 Mar 2019 12:36:23 +0100
Subject: [PATCH] test/ftl: Change fio_plugin from basic test to bdevperf

Ftl tests won't pass with fio_plugin when asan is enabled.

Change-Id: I6f07f661c19ecab302e291bbd76a7aad964000c7
Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/447318
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/ftl/bdevperf.sh | 22 ++++++++++++++++++++++
 test/ftl/ftl.sh      |  8 ++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100755 test/ftl/bdevperf.sh

diff --git a/test/ftl/bdevperf.sh b/test/ftl/bdevperf.sh
new file mode 100755
index 000000000..2424d5546
--- /dev/null
+++ b/test/ftl/bdevperf.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -e
+
+testdir=$(readlink -f $(dirname $0))
+rootdir=$(readlink -f $testdir/../..)
+
+source $rootdir/test/common/autotest_common.sh
+
+tests=('-q 1 -w randwrite -t 4 -o 69632' '-q 128 -w randwrite -t 4 -o 4096' '-q 128 -w verify -t 4 -o 4096')
+device=$1
+ftl_bdev_conf=$testdir/config/ftl.conf
+
+$rootdir/scripts/gen_ftl.sh -a $device -n nvme0 -l 0-3 > $ftl_bdev_conf
+
+for (( i=0; i<${#tests[@]}; i++ )) do
+	timing_enter "${tests[$i]}"
+	$rootdir/test/bdev/bdevperf/bdevperf -c $ftl_bdev_conf ${tests[$i]}
+	timing_exit "${tests[$i]}"
+done
+
+report_test_completion ftl_bdevperf
diff --git a/test/ftl/ftl.sh b/test/ftl/ftl.sh
index 21083bdd2..f6399e858 100755
--- a/test/ftl/ftl.sh
+++ b/test/ftl/ftl.sh
@@ -31,11 +31,11 @@ trap "at_ftl_exit" SIGINT SIGTERM EXIT
 PCI_WHITELIST="$device" PCI_BLACKLIST="" DRIVER_OVERRIDE="" ./scripts/setup.sh
 
 timing_enter ftl
-timing_enter fio
+timing_enter bdevperf
 
-run_test suite $testdir/fio.sh $device basic
+run_test suite $testdir/bdevperf.sh $device
 
-timing_exit fio
+timing_exit bdevperf
 
 timing_enter restore
 run_test suite $testdir/restore.sh $device
@@ -54,7 +54,7 @@ if [ $SPDK_TEST_FTL_EXTENDED -eq 1 ]; then
 	trap - SIGINT SIGTERM EXIT
 
 	timing_enter fio_extended
-	run_test suite $testdir/fio.sh $device extended $uuid
+	run_test suite $testdir/fio.sh extended $device $uuid
 	timing_exit fio_extended
 fi