Commit 0d11d2dd authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/nvme_perf: fix bdevperf location 



Bdevperf build directory was changed but
not updated in this script.

Change-Id: I939b541dbea6c94e7e2d3592890f4a4e8998d321
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16332


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 8e002e77

test/common/applications.sh

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ _root=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")") 
_root=${_root%/test/common}

_app_dir=$_root/build/bin

_test_app_dir=$_root/test/app

_examples_dir=$_root/build/examples



VHOST_FUZZ_APP=("$_test_app_dir/fuzz/vhost_fuzz/vhost_fuzz")

ISCSI_APP=("$_app_dir/iscsi_tgt")

test/nvme/perf/common.sh

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ function run_bdevperf() { 
	fi



	echo "** Running bdevperf test, this can take a while, depending on the run-time setting."

	$bdevperf_dir/bdevperf --json $testdir/bdev.conf -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME -m "[$CPUS_ALLOWED]" -r "$rpc_socket" $main_core_param -z &

	$_examples_dir/bdevperf --json $testdir/bdev.conf -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME -m "[$CPUS_ALLOWED]" -r "$rpc_socket" $main_core_param -z &

	bdevperf_pid=$!

	waitforlisten $bdevperf_pid
@@ -467,7 +467,7 @@ function run_nvmeperf() { 
	echo "** Running nvme perf test, this can take a while, depending on the run-time setting."



	# Run command in separate shell as this solves quoting issues related to r_opt var

	$SHELL -c "$nvmeperf_dir/perf $r_opt -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME -c [$CPUS_ALLOWED]"

	$SHELL -c "$_examples_dir/perf $r_opt -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME -c [$CPUS_ALLOWED]"

	sleep 1

}

test/nvme/perf/run_perf.sh

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ set -e 
testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../../..)

plugin_dir=$rootdir/build/fio

bdevperf_dir=$rootdir/examples/bdev/bdevperf

nvmeperf_dir=$rootdir/build/examples

source $testdir/common.sh

source $rootdir/scripts/common.sh || exit 1

source $rootdir/test/common/autotest_common.sh