diff --git a/test/common/applications.sh b/test/common/applications.sh index 25d5ff801..3c5121911 100644 --- a/test/common/applications.sh +++ b/test/common/applications.sh @@ -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") diff --git a/test/nvme/perf/common.sh b/test/nvme/perf/common.sh index 93f3ccad6..b67794f8b 100755 --- a/test/nvme/perf/common.sh +++ b/test/nvme/perf/common.sh @@ -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 } diff --git a/test/nvme/perf/run_perf.sh b/test/nvme/perf/run_perf.sh index 34798f31d..daa50f2ee 100755 --- a/test/nvme/perf/run_perf.sh +++ b/test/nvme/perf/run_perf.sh @@ -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