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

test: move report_test_completion into run_test 



This also requires us to change the create_test_list function to rely on
the run_test function for creating the canonical test list.

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


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 2f476a63

autotest.sh

+1 −3
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ fi 


if [ $SPDK_TEST_UNITTEST -eq 1 ]; then

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

	report_test_completion "unittest"

fi
@@ -236,10 +235,10 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
	fi



	if [ $SPDK_TEST_LVOL -eq 1 ]; then

		#TODO: rewrite lvol tests in bash.

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

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

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

		report_test_completion "lvol"

	fi



	if [ $SPDK_TEST_VHOST_INIT -eq 1 ]; then
@@ -248,7 +247,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
		run_test "spdkcli_virtio" ./test/spdkcli/virtio.sh

		run_test "vhost_shared" ./test/vhost/shared/shared.sh

		run_test "vhost_fuzz" ./test/vhost/fuzz/fuzz.sh

		report_test_completion "vhost initiator"

		timing_exit vhost_initiator

	fi

test/bdev/bdev_raid.sh

+0 −1
Original line number Diff line number Diff line
@@ -117,4 +117,3 @@ trap 'on_error_exit;' ERR 
raid_function_test



rm -f $tmp_file
 
report_test_completion "bdev_raid"

test/bdev/blockdev.sh

+0 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ function fio_test_suite() { 


	rm -f ./*.state

	rm -f $testdir/bdev.fio

	report_test_completion "bdev_fio"

}



function get_io_result() {
@@ -280,7 +279,6 @@ run_test "bdev_qos" qos_test_suite 
# Temporarily disabled - infinite loop

# if [ $RUN_NIGHTLY -eq 1 ]; then

	# run_test "bdev_gpt_reset" $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 16 -w reset -o 4096 -t 60

	# report_test_completion "nightly_bdev_reset"

# fi



# Bdev and configuration cleanup below this line
@@ -294,4 +292,3 @@ rm -f /tmp/aiofile 
rm -f /tmp/spdk-pmem-pool

rm -f $testdir/bdev.conf

rbd_cleanup
 
report_test_completion "bdev"

test/blobfs/blobfs.sh

+0 −1
Original line number Diff line number Diff line
@@ -143,4 +143,3 @@ blobfs_fuse_test 


rm -rf $mount_dir

rm -f $tmp_file
 
report_test_completion "blobfs"

test/blobfs/rocksdb/rocksdb.sh

+0 −2
Original line number Diff line number Diff line
@@ -134,5 +134,3 @@ trap - SIGINT SIGTERM EXIT 


run_bsdump

rm -f $ROCKSDB_CONF
 


report_test_completion "blobfs"