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

tests: Switch to $SPDK_TEST_STORAGE for writing out bigger tmp files 



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


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 1430096a

test/bdev/bdev_raid.sh

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../..)

rpc_server=/var/tmp/spdk-raid.sock

rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"

tmp_file=/tmp/raidrandtest

tmp_file=$SPDK_TEST_STORAGE/raidrandtest



source $rootdir/test/common/autotest_common.sh

source $testdir/nbd_common.sh

test/bdev/blockdev.sh

+7 −7
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ conf_file="$testdir/bdev.json" 
: > "$conf_file"



function cleanup() {

	rm -f "/tmp/aiofile"

	rm -f "/tmp/spdk-pmem-pool"

	rm -f "$SPDK_TEST_STORAGE/aiofile"

	rm -f "$SPDK_TEST_STORAGE/spdk-pmem-pool"

	rm -f "$conf_file"



	if [[ $test_type == rbd ]]; then
@@ -44,8 +44,8 @@ function setup_bdev_conf() { 
	#$rpc_py bdev_set_qos_limit --rw_mbytes_per_sec 100 Malloc3

	#$rpc_py bdev_set_qos_limit --rw_ios_per_sec 20000 Malloc0

	if [[ $(uname -s) != "FreeBSD" ]]; then

		dd if=/dev/zero of=/tmp/aiofile bs=2048 count=5000

		"$rpc_py" bdev_aio_create "/tmp/aiofile" AIO0 2048

		dd if=/dev/zero of="$SPDK_TEST_STORAGE/aiofile" bs=2048 count=5000

		"$rpc_py" bdev_aio_create "$SPDK_TEST_STORAGE/aiofile" AIO0 2048

	fi

}
@@ -124,9 +124,9 @@ function setup_crypto_qat_conf() { 


function setup_pmem_conf() {

	if hash pmempool; then

		rm -f /tmp/spdk-pmem-pool

		pmempool create blk --size=32M 512 /tmp/spdk-pmem-pool

		"$rpc_py" bdev_pmem_create -n Pmem0 "/tmp/spdk-pmem-pool"

		rm -f "$SPDK_TEST_STORAGE/spdk-pmem-pool"

		pmempool create blk --size=32M 512 "$SPDK_TEST_STORAGE/spdk-pmem-pool"

		"$rpc_py" bdev_pmem_create -n Pmem0 "$SPDK_TEST_STORAGE/spdk-pmem-pool"

	else

		return 1

	fi

test/bdev/nbd_common.sh

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ function nbd_get_count() { 
function nbd_dd_data_verify() {

	local nbd_list=($1)

	local operation=$2

	local tmp_file=/tmp/nbdrandtest

	local tmp_file=$SPDK_TEST_STORAGE/nbdrandtest



	if [ "$operation" = "write" ]; then

		# data write

test/blobfs/blobfs.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../..)

rpc_server=/var/tmp/spdk-blobfs.sock

rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"

tmp_file=/tmp/blobfs_file

tmp_file=$SPDK_TEST_STORAGE/blobfs_file

conf_file=/tmp/blobfs.conf

bdevname=BlobfsBdev

mount_dir=/tmp/spdk_tmp_mount

test/common/autotest_common.sh

+3 −3
Original line number Diff line number Diff line
@@ -665,9 +665,9 @@ function waitfornbd() { 
	#  file.  Note that dd returns success when reading an empty file, so we

	#  need to check the size of the output file instead.

	for ((i = 1; i <= 20; i++)); do

		dd if=/dev/$nbd_name of=/tmp/nbdtest bs=4096 count=1 iflag=direct

		size=$(stat -c %s /tmp/nbdtest)

		rm -f /tmp/nbdtest

		dd if=/dev/$nbd_name of="$SPDK_TEST_STORAGE/nbdtest" bs=4096 count=1 iflag=direct

		size=$(stat -c %s "$SPDK_TEST_STORAGE/nbdtest")

		rm -f "$SPDK_TEST_STORAGE/nbdtest"

		if [ "$size" != "0" ]; then

			return 0

		else