Commit 1fafd71b authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

test: add timing calls to run_test 



And clean out the corresponding calls to timing_enter and timing_exit
from the various test scripts.

Change-Id: I0759417b5a529e4c3649ce04cca1799c089da278
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476804


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent fd17f1aa

autotest.sh

+0 −4
Original line number Diff line number Diff line
@@ -144,10 +144,8 @@ fi 
#####################



if [ $SPDK_TEST_UNITTEST -eq 1 ]; then

	timing_enter unittest

	run_test suite "unittest" ./test/unit/unittest.sh

	report_test_completion "unittest"

	timing_exit unittest

fi
@@ -223,12 +221,10 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
	fi



	if [ $SPDK_TEST_LVOL -eq 1 ]; then

		timing_enter lvol

		run_test suite "lvol" ./test/lvol/lvol.sh --test-cases=all

		run_test suite "lvol2" ./test/lvol/lvol2.sh

		run_test suite "blob_io_wait" ./test/blobstore/blob_io_wait/blob_io_wait.sh

		report_test_completion "lvol"

		timing_exit lvol

	fi



	if [ $SPDK_TEST_VHOST_INIT -eq 1 ]; then

test/bdev/bdev_raid.sh

+0 −2
Original line number Diff line number Diff line
@@ -112,11 +112,9 @@ function raid_function_test() { 
	return 0

}



timing_enter bdev_raid

trap 'on_error_exit;' ERR



raid_function_test



rm -f $tmp_file

report_test_completion "bdev_raid"
 
timing_exit bdev_raid

test/bdev/blockdev.sh

+0 −3
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ function qos_function_test() { 
	fi

}



timing_enter bdev



# Create a file to be used as an AIO backend

dd if=/dev/zero of=/tmp/aiofile bs=2048 count=5000
@@ -301,4 +299,3 @@ rm -f /tmp/spdk-pmem-pool 
rm -f $testdir/bdev.conf

rbd_cleanup

report_test_completion "bdev"
 
timing_exit bdev

test/blobfs/blobfs.sh

+0 −4
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ function blobfs_fuse_test() { 
	killprocess $blobfs_pid

}



timing_enter blobfs



trap 'on_error_exit;' ERR



# Create one temp file as test bdev
@@ -146,5 +144,3 @@ blobfs_fuse_test 
rm -rf $mount_dir

rm -f $tmp_file

report_test_completion "blobfs"
 


timing_exit blobfs

test/blobfs/rocksdb/rocksdb.sh

+0 −3
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ if [ ! -e $DB_BENCH_DIR ]; then 
	exit 0

fi



timing_enter rocksdb



timing_enter db_bench_build



pushd $DB_BENCH_DIR
@@ -154,4 +152,3 @@ run_bsdump 
rm -f $ROCKSDB_CONF



report_test_completion "blobfs"
 
timing_exit rocksdb