ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/bdev: start converting to run_test semantics.

Browse Source 
Change-Id: Ic007e6cf8e00402fb5a1e0343b3314f4242efcd0
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477489
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Seth Howell 2019-12-10 10:49:31 -07:00 committed by Tomasz Zawadzki
parent 3455bfad55
commit 8295a2b0b7
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/bdev/blockdev.sh
View File

@ -7,6 +7,17 @@ source $testdir/nbd_common.sh
rpc_py="$rootdir/scripts/rpc.py" rpc_py="$rootdir/scripts/rpc.py"
function bdev_bounds() {
$testdir/bdevio/bdevio -w -s $PRE_RESERVED_MEM -c $testdir/bdev.conf &
bdevio_pid=$!
trap 'killprocess $bdevio_pid; exit 1' SIGINT SIGTERM EXIT
echo "Process bdevio pid: $bdevio_pid"
waitforlisten $bdevio_pid
$testdir/bdevio/tests.py perform_tests
killprocess $bdevio_pid
trap - SIGINT SIGTERM EXIT
}
function run_fio() function run_fio()
{ {
if [ $RUN_NIGHTLY -eq 0 ]; then if [ $RUN_NIGHTLY -eq 0 ]; then
@ -202,27 +213,13 @@ $rootdir/scripts/gen_nvme.sh >> $testdir/bdev_gpt.conf
#----------------------------------------------------- #-----------------------------------------------------
if [ $RUN_NIGHTLY -eq 1 ]; then if [ $RUN_NIGHTLY -eq 1 ]; then
timing_enter hello_bdev
if grep -q Nvme0 $testdir/bdev.conf; then if grep -q Nvme0 $testdir/bdev.conf; then
$rootdir/examples/bdev/hello_world/hello_bdev -c $testdir/bdev.conf -b Nvme0n1p1 run_test "case" "bdev_hello_world" $rootdir/examples/bdev/hello_world/hello_bdev -c $testdir/bdev.conf -b Nvme0n1p1
fi fi
timing_exit hello_bdev
fi fi
timing_enter bounds run_test "case" "bdev_bounds" bdev_bounds
$testdir/bdevio/bdevio -w -s $PRE_RESERVED_MEM -c $testdir/bdev.conf & run_test "case" "bdev_nbd" nbd_function_test $testdir/bdev.conf "$bdevs_name"
bdevio_pid=$!
trap 'killprocess $bdevio_pid; exit 1' SIGINT SIGTERM EXIT
echo "Process bdevio pid: $bdevio_pid"
waitforlisten $bdevio_pid
$testdir/bdevio/tests.py perform_tests
killprocess $bdevio_pid
trap - SIGINT SIGTERM EXIT
timing_exit bounds
timing_enter nbd
nbd_function_test $testdir/bdev.conf "$bdevs_name"
timing_exit nbd
if [ -d /usr/src/fio ]; then if [ -d /usr/src/fio ]; then
timing_enter fio timing_enter fio
@ -260,17 +257,14 @@ else
fi fi
# Run bdevperf with gpt # Run bdevperf with gpt
$testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w verify -t 5 run_test "case" "bdev_gpt_verify" $testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w verify -t 5
$testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w write_zeroes -t 1 run_test "case" "bdev_gpt_write_zeroes" $testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w write_zeroes -t 1
rm -f $testdir/bdev_gpt.conf
if [ $RUN_NIGHTLY -eq 1 ]; then # Temporarily disabled - infinite loop
# Temporarily disabled - infinite loop # if [ $RUN_NIGHTLY -eq 1 ]; then
timing_enter reset # run_test "case" "bdev_gpt_reset" $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 16 -w reset -o 4096 -t 60
#$testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 16 -w reset -o 4096 -t 60 # report_test_completion "nightly_bdev_reset"
timing_exit reset # fi
report_test_completion "nightly_bdev_reset"
fi
timing_enter qos timing_enter qos
@ -300,6 +294,7 @@ if grep -q Nvme0 $testdir/bdev.conf; then
part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir reset part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir reset
fi fi
rm -f $testdir/bdev_gpt.conf
rm -f /tmp/aiofile rm -f /tmp/aiofile
rm -f /tmp/spdk-pmem-pool rm -f /tmp/spdk-pmem-pool
rm -f $testdir/bdev.conf rm -f $testdir/bdev.conf