Commit 053c15b3 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

fio: Remove hardcoded path to fio repo 



The hardcoded path is replaced with $CONFIG_FIO_SOURCE_DIR as defined
during the compile time.

Additionally, all checks which determine if fio is available are now
based on $CONFIG_FIO_PLUGIN=y knob instead of the presence of the fio
repo.

Change-Id: Ie469747f3863c9561f53d32e8c3f29778afaaf74
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1108


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 6aa9db94

test/bdev/blockdev.sh

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ hello_world_bdev=${bdev_list[0]} 
run_test "bdev_hello_world" $rootdir/examples/bdev/hello_world/hello_bdev -c $conf_file -b $hello_world_bdev

run_test "bdev_bounds" bdev_bounds

run_test "bdev_nbd" nbd_function_test $conf_file "$bdevs_name"

if [ -d /usr/src/fio ]; then

if [[ $CONFIG_FIO_PLUGIN == y ]]; then

        if [ "$test_type" = "nvme" ] || [ "$test_type" = "gpt" ]; then

                # TODO: once we get real multi-ns drives, re-enable this test for NVMe.

                echo "skipping fio tests on NVMe due to multi-ns failures."

test/common/autotest_common.sh

+9 −9
Original line number Diff line number Diff line
@@ -122,10 +122,10 @@ cat << EOL >> "$asan_suppression_file" 
leak:spdk_fs_alloc_thread_ctx



# Suppress known leaks in fio project

leak:/usr/src/fio/parse.c

leak:/usr/src/fio/iolog.c

leak:/usr/src/fio/init.c

leak:/usr/src/fio/filesetup.c

leak:$CONFIG_FIO_SOURCE_DIR/parse.c

leak:$CONFIG_FIO_SOURCE_DIR/iolog.c

leak:$CONFIG_FIO_SOURCE_DIR/init.c

leak:$CONFIG_FIO_SOURCE_DIR/filesetup.c

leak:fio_memalign

leak:spdk_fio_io_u_init
@@ -186,8 +186,8 @@ if [ -f /usr/include/infiniband/verbs.h ]; then 
	config_params+=' --with-rdma'

fi



if [ -d /usr/src/fio ]; then

	config_params+=' --with-fio=/usr/src/fio'

if [[ -d $CONFIG_FIO_SOURCE_DIR ]]; then

	config_params+=" --with-fio=$CONFIG_FIO_SOURCE_DIR"

fi



if [ -d ${DEPENDENCY_DIR}/vtune_codes ]; then
@@ -941,7 +941,7 @@ function fio_config_gen() 
	local config_file=$1

	local workload=$2

	local bdev_type=$3

	local fio_dir="/usr/src/fio"

	local fio_dir=$CONFIG_FIO_SOURCE_DIR



	if [ -e "$config_file" ]; then

		echo "Configuration File Already Exists!: $config_file"
@@ -1009,7 +1009,7 @@ function fio_config_add_job() 
function fio_bdev()

{

	# Setup fio binary cmd line

	local fio_dir="/usr/src/fio"

	local fio_dir=$CONFIG_FIO_SOURCE_DIR

	local bdev_plugin="$rootdir/examples/bdev/fio_plugin/fio_plugin"



	# Preload AddressSanitizer library to fio if fio_plugin was compiled with it
@@ -1022,7 +1022,7 @@ function fio_bdev() 
function fio_nvme()

{

	# Setup fio binary cmd line

	local fio_dir="/usr/src/fio"

	local fio_dir=$CONFIG_FIO_SOURCE_DIR

	local nvme_plugin="$rootdir/examples/nvme/fio_plugin/fio_plugin"



	# Preload AddressSanitizer library to fio if fio_plugin was compiled with it

test/ftl/fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ device=$1 
tests=${suite[$2]}

uuid=$3



if [ ! -d /usr/src/fio ]; then

if [[ $CONFIG_FIO_PLUGIN != y ]]; then

	echo "FIO not available"

	exit 1

fi

test/iscsi_tgt/perf/iscsi_target.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ MIX=100 
IODEPTH=128

RUNTIME=60

RAMP_TIME=10

FIO_PATH="/usr/src/fio"

FIO_PATH=$CONFIG_FIO_SOURCE_DIR

DISKNO="ALL"

CPUMASK=0x02

NUM_JOBS=1

test/nvme/nvme.sh

+1 −1
Original line number Diff line number Diff line
@@ -125,6 +125,6 @@ if [ $(uname) != "FreeBSD" ]; then 
	kill_stub

fi



if [ -d /usr/src/fio ]; then

if [[ $CONFIG_FIO_PLUGIN == y ]]; then

	run_test "nvme_fio" nvme_fio_test

fi