From a571eb03e9be8ade18e954973327021ea170cfe6 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Thu, 5 Dec 2019 16:21:48 -0700
Subject: [PATCH] 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: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476962
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Karol 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: SPDK CI Jenkins <sys_sgci@intel.com>
---
 autotest.sh                                   |  4 +---
 test/bdev/bdev_raid.sh                        |  1 -
 test/bdev/blockdev.sh                         |  3 ---
 test/blobfs/blobfs.sh                         |  1 -
 test/blobfs/rocksdb/rocksdb.sh                |  2 --
 test/blobstore/blob_io_wait/blob_io_wait.sh   |  2 --
 test/common/autotest_common.sh                | 11 ++++++-----
 test/env/env.sh                               |  2 --
 test/event/event.sh                           |  1 -
 test/ftl/bdevperf.sh                          |  2 --
 test/ftl/dirty_shutdown.sh                    |  2 --
 test/ftl/fio.sh                               |  2 --
 test/ftl/restore.sh                           |  2 --
 test/ioat/ioat.sh                             |  2 --
 test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh   |  1 -
 test/iscsi_tgt/ext4test/ext4test.sh           |  1 -
 test/iscsi_tgt/initiator/initiator.sh         |  1 -
 test/iscsi_tgt/ip_migration/ip_migration.sh   |  1 -
 test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh |  1 -
 test/iscsi_tgt/pmem/iscsi_pmem.sh             |  1 -
 test/iscsi_tgt/rbd/rbd.sh                     |  1 -
 test/iscsi_tgt/sock/sock.sh                   |  2 --
 test/nvme/hotplug.sh                          |  1 -
 test/nvme/hw_hotplug.sh                       |  5 -----
 test/nvme/nvme.sh                             |  3 ---
 test/nvme/spdk_nvme_cli.sh                    |  2 --
 test/nvme/spdk_nvme_cli_cuse.sh               |  2 --
 test/nvme/spdk_smartctl_cuse.sh               |  5 -----
 test/nvmf/nvmf.sh                             |  2 --
 test/nvmf/target/nvme_cli.sh                  |  1 -
 test/ocf/ocf.sh                               |  2 --
 test/pmem/pmem.sh                             |  1 -
 test/spdkcli/iscsi.sh                         |  1 -
 test/spdkcli/nvmf.sh                          |  1 -
 test/spdkcli/pmem.sh                          |  1 -
 test/spdkcli/raid.sh                          |  1 -
 test/spdkcli/rbd.sh                           |  2 --
 test/spdkcli/tcp.sh                           |  2 --
 test/spdkcli/vhost.sh                         |  2 --
 test/vhost/initiator/blockdev.sh              |  1 -
 test/vhost/manual.sh                          |  1 -
 test/vhost/vhost.sh                           |  9 ---------
 test/vmd/vmd.sh                               |  1 -
 43 files changed, 7 insertions(+), 85 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 78609e8a7..a3b161f57 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -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
 
diff --git a/test/bdev/bdev_raid.sh b/test/bdev/bdev_raid.sh
index 21683996e..99952d16a 100755
--- a/test/bdev/bdev_raid.sh
+++ b/test/bdev/bdev_raid.sh
@@ -117,4 +117,3 @@ trap 'on_error_exit;' ERR
 raid_function_test
 
 rm -f $tmp_file
-report_test_completion "bdev_raid"
diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index b963a2b33..473030706 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -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"
diff --git a/test/blobfs/blobfs.sh b/test/blobfs/blobfs.sh
index 473e3d398..02ba99155 100755
--- a/test/blobfs/blobfs.sh
+++ b/test/blobfs/blobfs.sh
@@ -143,4 +143,3 @@ blobfs_fuse_test
 
 rm -rf $mount_dir
 rm -f $tmp_file
-report_test_completion "blobfs"
diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh
index 65c1818ca..8f660e002 100755
--- a/test/blobfs/rocksdb/rocksdb.sh
+++ b/test/blobfs/rocksdb/rocksdb.sh
@@ -134,5 +134,3 @@ trap - SIGINT SIGTERM EXIT
 
 run_bsdump
 rm -f $ROCKSDB_CONF
-
-report_test_completion "blobfs"
diff --git a/test/blobstore/blob_io_wait/blob_io_wait.sh b/test/blobstore/blob_io_wait/blob_io_wait.sh
index 3fe8c95d7..72f64416f 100755
--- a/test/blobstore/blob_io_wait/blob_io_wait.sh
+++ b/test/blobstore/blob_io_wait/blob_io_wait.sh
@@ -59,5 +59,3 @@ sync
 rm -rf $testdir/bdevperf.conf
 rm -rf $testdir/aio.bdev
 trap - SIGINT SIGTERM EXIT
-
-report_test_completion "blob_io_wait"
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 6c2a79288..c6c453970 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -330,11 +330,11 @@ function timing_finish() {
 }
 
 function create_test_list() {
-	grep -rshI --exclude="autotest_common.sh" --exclude="$rootdir/test/common/autotest_common.sh" -e "report_test_completion" $rootdir | sed 's/report_test_completion//g; s/[[:blank:]]//g; s/"//g;' > $output_dir/all_tests.txt || true
-}
-
-function report_test_completion() {
-	echo "$1" >> $output_dir/test_completions.txt
+	grep -rshI --exclude="autotest_common.sh" \
+	--exclude="$rootdir/test/common/autotest_common.sh" \
+	-e "run_test " $rootdir | grep -v "#" \
+	| sed 's/^.*run_test/run_test/' | awk '{print $2}' | \
+	sed 's/\"//g' | sort > $output_dir/all_tests.txt || true
 }
 
 function process_core() {
@@ -602,6 +602,7 @@ function run_test() {
 	echo "END TEST $test_name"
 	echo "************************************"
 
+	echo "$test_name" >> $output_dir/test_completions.txt
 	timing_exit $test_name
 	xtrace_restore
 }
diff --git a/test/env/env.sh b/test/env/env.sh
index 87754a00e..696c14b08 100755
--- a/test/env/env.sh
+++ b/test/env/env.sh
@@ -25,5 +25,3 @@ if [ $(uname) = Linux ]; then
 	# supported on Linux
 	run_test "env_mem_callbacks" $testdir/mem_callbacks/mem_callbacks
 fi
-
-report_test_completion "env"
diff --git a/test/event/event.sh b/test/event/event.sh
index 58114188d..fe023edb7 100755
--- a/test/event/event.sh
+++ b/test/event/event.sh
@@ -7,4 +7,3 @@ source $rootdir/test/common/autotest_common.sh
 run_test "event_perf" $testdir/event_perf/event_perf -m 0xF -t 1
 run_test "event_reactor" $testdir/reactor/reactor -t 1
 run_test "event_reactor_perf" $testdir/reactor_perf/reactor_perf -t 1
-report_test_completion "event"
diff --git a/test/ftl/bdevperf.sh b/test/ftl/bdevperf.sh
index 177e252cd..64aad6349 100755
--- a/test/ftl/bdevperf.sh
+++ b/test/ftl/bdevperf.sh
@@ -15,5 +15,3 @@ for (( i=0; i<${#tests[@]}; i++ )) do
 	$rootdir/test/bdev/bdevperf/bdevperf -c $ftl_bdev_conf ${tests[$i]}
 	timing_exit "${tests[$i]}"
 done
-
-report_test_completion ftl_bdevperf
diff --git a/test/ftl/dirty_shutdown.sh b/test/ftl/dirty_shutdown.sh
index 73055cc4c..274937633 100755
--- a/test/ftl/dirty_shutdown.sh
+++ b/test/ftl/dirty_shutdown.sh
@@ -86,7 +86,5 @@ echo 3 > /proc/sys/vm/drop_caches
 dd if=/dev/nbd0 bs=4K count=$data_size | md5sum -c $testdir/testfile.md5
 dd if=/dev/nbd0 bs=4K count=$chunk_size skip=$data_size | md5sum -c $testdir/testfile2.md5
 
-report_test_completion ftl_dirty_shutdown
-
 trap - SIGINT SIGTERM EXIT
 restore_kill
diff --git a/test/ftl/fio.sh b/test/ftl/fio.sh
index d9ce20899..244bafa5d 100755
--- a/test/ftl/fio.sh
+++ b/test/ftl/fio.sh
@@ -36,5 +36,3 @@ for test in ${tests}; do
 	fio_bdev $testdir/config/fio/$test.fio
 	timing_exit $test
 done
-
-report_test_completion ftl_fio
diff --git a/test/ftl/restore.sh b/test/ftl/restore.sh
index fc79d7b3a..867575fae 100755
--- a/test/ftl/restore.sh
+++ b/test/ftl/restore.sh
@@ -92,7 +92,5 @@ echo 3 > /proc/sys/vm/drop_caches
 md5sum -c $testdir/testfile.md5
 md5sum -c $testdir/testfile2.md5
 
-report_test_completion occsd_restore
-
 trap - SIGINT SIGTERM EXIT
 restore_kill
diff --git a/test/ioat/ioat.sh b/test/ioat/ioat.sh
index f2486135b..08f6ab003 100755
--- a/test/ioat/ioat.sh
+++ b/test/ioat/ioat.sh
@@ -7,5 +7,3 @@ source $rootdir/test/common/autotest_common.sh
 run_test "ioat_perf" $rootdir/examples/ioat/perf/ioat_perf -t 1
 
 run_test "ioat_verify" $rootdir/examples/ioat/verify/verify -t 1
-
-report_test_completion "ioat"
diff --git a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
index 959d3b140..b754b8099 100755
--- a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
+++ b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
@@ -52,4 +52,3 @@ trap - SIGINT SIGTERM EXIT
 killprocess $pid
 
 iscsitestfini $1 $2
-report_test_completion "bdev_io_wait"
diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh
index 7e8f828a6..7a7a9f111 100755
--- a/test/iscsi_tgt/ext4test/ext4test.sh
+++ b/test/iscsi_tgt/ext4test/ext4test.sh
@@ -129,4 +129,3 @@ fi
 
 killprocess $pid
 iscsitestfini $1 $2
-report_test_completion "nightly_iscsi_ext4test"
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index f7c05d324..82e1a2398 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -54,4 +54,3 @@ trap - SIGINT SIGTERM EXIT
 killprocess $pid
 
 iscsitestfini $1 $2
-report_test_completion "iscsi_initiator"
diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh
index 956b78ac6..c8006670b 100755
--- a/test/iscsi_tgt/ip_migration/ip_migration.sh
+++ b/test/iscsi_tgt/ip_migration/ip_migration.sh
@@ -127,4 +127,3 @@ iscsicleanup
 
 $rpc_py -s $rpc_second_addr spdk_kill_instance SIGTERM
 iscsitestfini $1 $2
-report_test_completion "iscsi_ip_migration"
diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
index 7ccf07d1d..fa48fadf0 100755
--- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
+++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
@@ -97,6 +97,5 @@ iscsicleanup
 killprocess $iscsipid
 $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
 
-report_test_completion "iscsi_nvme_remote"
 iscsitestfini $1 $2
 nvmftestfini
diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh
index 7ad873d3d..1f0378284 100755
--- a/test/iscsi_tgt/pmem/iscsi_pmem.sh
+++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh
@@ -72,4 +72,3 @@ trap - SIGINT SIGTERM EXIT
 rm -f ./local-job*
 rm -f /tmp/pool_file*
 killprocess $pid
-report_test_completion "nightly_iscsi_pmem"
diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh
index 08877280e..73f6dec5b 100755
--- a/test/iscsi_tgt/rbd/rbd.sh
+++ b/test/iscsi_tgt/rbd/rbd.sh
@@ -65,4 +65,3 @@ killprocess $pid
 rbd_cleanup
 
 iscsitestfini $1 $2
-report_test_completion "iscsi_rbd"
diff --git a/test/iscsi_tgt/sock/sock.sh b/test/iscsi_tgt/sock/sock.sh
index 2f177756f..a81660c3a 100755
--- a/test/iscsi_tgt/sock/sock.sh
+++ b/test/iscsi_tgt/sock/sock.sh
@@ -96,7 +96,6 @@ trap '-' SIGINT SIGTERM EXIT
 # NOTE: socat returns code 143 on SIGINT
 killprocess $server_pid || true
 
-report_test_completion "sock_client"
 timing_exit sock_client
 
 # ----------------
@@ -123,5 +122,4 @@ trap - SIGINT SIGTERM EXIT
 killprocess $server_pid
 
 iscsitestfini $1 $2
-report_test_completion "sock_server"
 timing_exit sock_server
diff --git a/test/nvme/hotplug.sh b/test/nvme/hotplug.sh
index 1121e891e..3b2863dd9 100755
--- a/test/nvme/hotplug.sh
+++ b/test/nvme/hotplug.sh
@@ -140,5 +140,4 @@ kill -9 $qemupid
 rm "$qemu_pidfile"
 rm "$test_img"
 
-report_test_completion "nvme_hotplug"
 timing_exit hotplug_test
diff --git a/test/nvme/hw_hotplug.sh b/test/nvme/hw_hotplug.sh
index 276e61ad4..ab83cfb94 100755
--- a/test/nvme/hw_hotplug.sh
+++ b/test/nvme/hw_hotplug.sh
@@ -20,8 +20,6 @@ driver=$3
 declare -i io_time=5
 declare -i kernel_hotplug_time=7
 
-timing_enter hotplug_hw
-
 timing_enter hotplug_hw_cfg
 
 # Configure microcontroller
@@ -74,7 +72,4 @@ timing_exit wait_for_example
 
 trap - SIGINT SIGTERM EXIT
 
-report_test_completion "nvme_hotplug_hw"
 timing_exit hotplug_hw_test
-
-timing_exit hotplug_hw
diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh
index b3500d729..ba153cf8e 100755
--- a/test/nvme/nvme.sh
+++ b/test/nvme/nvme.sh
@@ -20,7 +20,6 @@ function nvme_perf {
 	if [ -b /dev/ram0 ]; then
 		# Test perf with AIO device
 		$rootdir/examples/nvme/perf/perf /dev/ram0 -q 128 -w read -o 12288 -t 1 -LL -i 0
-		report_test_completion "nvme_perf"
 	fi
 }
 
@@ -29,7 +28,6 @@ function nvme_fio_test {
 	for bdf in $(iter_pci_class_code 01 08 02); do
 		for blkname in $(get_nvme_name_from_bdf $bdf); do
 			fio_nvme $PLUGIN_DIR/example_config.fio --filename="trtype=PCIe traddr=${bdf//:/.} ns=${blkname##*n}"
-			report_test_completion "nvme_fio"
 		done
 	done
 }
@@ -42,7 +40,6 @@ function nvme_multi_secondary {
 	$rootdir/examples/nvme/perf/perf -i 0 -q 16 -w read -o 4096 -t 3 -c 0x4
 	wait $pid0
 	wait $pid1
-	report_test_completion "nvme_multi_secondary"
 }
 
 if [ $(uname) = Linux ]; then
diff --git a/test/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh
index ab92137fa..a7f46e55e 100755
--- a/test/nvme/spdk_nvme_cli.sh
+++ b/test/nvme/spdk_nvme_cli.sh
@@ -48,5 +48,3 @@ if [ $(uname) = Linux ]; then
 	trap - SIGINT SIGTERM EXIT
 	kill_stub
 fi
-
-report_test_completion spdk_nvme_cli
diff --git a/test/nvme/spdk_nvme_cli_cuse.sh b/test/nvme/spdk_nvme_cli_cuse.sh
index fa75d1f89..621ec3fbe 100755
--- a/test/nvme/spdk_nvme_cli_cuse.sh
+++ b/test/nvme/spdk_nvme_cli_cuse.sh
@@ -70,5 +70,3 @@ fi
 
 trap - SIGINT SIGTERM EXIT
 killprocess $spdk_tgt_pid
-
-report_test_completion spdk_nvme_cli_cuse
diff --git a/test/nvme/spdk_smartctl_cuse.sh b/test/nvme/spdk_smartctl_cuse.sh
index f2d5fef4a..4348f7b10 100755
--- a/test/nvme/spdk_smartctl_cuse.sh
+++ b/test/nvme/spdk_smartctl_cuse.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../..)
 source $rootdir/scripts/common.sh
 source $rootdir/test/common/autotest_common.sh
 
-timing_enter nvme_smartctl_cuse
-
 SMARTCTL_CMD='smartctl -d nvme'
 rpc_py=$rootdir/scripts/rpc.py
 
@@ -80,6 +78,3 @@ fi
 
 trap - SIGINT SIGTERM EXIT
 killprocess $spdk_tgt_pid
-
-report_test_completion spdk_nvme_smartctl_cuse
-timing_exit nvme_smartctl_cuse
diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh
index 6cc0e858a..56ea03b96 100755
--- a/test/nvmf/nvmf.sh
+++ b/test/nvmf/nvmf.sh
@@ -56,5 +56,3 @@ timing_exit host
 
 trap - SIGINT SIGTERM EXIT
 revert_soft_roce
-
-report_test_completion "nvmf"
diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh
index 5caf11790..6e7614451 100755
--- a/test/nvmf/target/nvme_cli.sh
+++ b/test/nvmf/target/nvme_cli.sh
@@ -73,4 +73,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
 trap - SIGINT SIGTERM EXIT
 
 nvmftestfini
-report_test_completion "nvmf_spdk_nvme_cli"
diff --git a/test/ocf/ocf.sh b/test/ocf/ocf.sh
index 281bfaa66..415befc67 100755
--- a/test/ocf/ocf.sh
+++ b/test/ocf/ocf.sh
@@ -12,5 +12,3 @@ run_test "ocf_create_destruct" "$testdir/management/create-destruct.sh"
 run_test "ocf_multicore" "$testdir/management/multicore.sh"
 run_test "ocf_persistent_metadata" "$testdir/management/persistent-metadata.sh"
 run_test "ocf_remove" "$testdir/management/remove.sh"
-
-report_test_completion "ocf"
diff --git a/test/pmem/pmem.sh b/test/pmem/pmem.sh
index fa40d0908..54fe9dc22 100755
--- a/test/pmem/pmem.sh
+++ b/test/pmem/pmem.sh
@@ -691,5 +691,4 @@ if $test_delete_bdev || $test_all; then
 fi
 
 pmem_clean_pool_file
-report_test_completion "pmem"
 vhost_kill 0
diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh
index ecce5b2cf..c2444e97b 100755
--- a/test/spdkcli/iscsi.sh
+++ b/test/spdkcli/iscsi.sh
@@ -70,4 +70,3 @@ $spdkcli_job "'/iscsi/auth_groups delete_secret 1 test2' 'user=test2'
 timing_exit spdkcli_clear_iscsi_config
 
 killprocess $iscsi_tgt_pid
-report_test_completion spdk_cli
diff --git a/test/spdkcli/nvmf.sh b/test/spdkcli/nvmf.sh
index b198d2df7..afbe7c7b3 100755
--- a/test/spdkcli/nvmf.sh
+++ b/test/spdkcli/nvmf.sh
@@ -83,4 +83,3 @@ timing_exit spdkcli_clear_nvmf_config
 
 killprocess $nvmf_tgt_pid
 #revert_soft_roce
-report_test_completion spdk_cli_nvmf
diff --git a/test/spdkcli/pmem.sh b/test/spdkcli/pmem.sh
index 64dbdaf1f..abecd73ca 100755
--- a/test/spdkcli/pmem.sh
+++ b/test/spdkcli/pmem.sh
@@ -45,4 +45,3 @@ rm -f $testdir/match_files/spdkcli_pmem_info.test
 timing_exit spdkcli_clear_pmem_config
 
 killprocess $spdk_tgt_pid
-report_test_completion spdk_cli
diff --git a/test/spdkcli/raid.sh b/test/spdkcli/raid.sh
index eecf47d1b..9bbde4719 100755
--- a/test/spdkcli/raid.sh
+++ b/test/spdkcli/raid.sh
@@ -44,4 +44,3 @@ $spdkcli_job "'/bdevs/malloc delete Malloc1' '' True
 timing_exit spdkcli_delete_malloc
 
 killprocess $spdk_tgt_pid
-report_test_completion spdk_cli
diff --git a/test/spdkcli/rbd.sh b/test/spdkcli/rbd.sh
index f26299e92..bc6c798f6 100755
--- a/test/spdkcli/rbd.sh
+++ b/test/spdkcli/rbd.sh
@@ -30,5 +30,3 @@ rbd_cleanup
 timing_exit spdkcli_clear_rbd_config
 
 killprocess $spdk_tgt_pid
-
-report_test_completion spdk_cli_rbd
diff --git a/test/spdkcli/tcp.sh b/test/spdkcli/tcp.sh
index 4162e2b78..e786264c4 100755
--- a/test/spdkcli/tcp.sh
+++ b/test/spdkcli/tcp.sh
@@ -58,5 +58,3 @@ waitfortcplisten $spdk_tgt_pid $IP_ADDRESS $PORT
 timing_exit run_spdk_tgt_tcp
 
 killprocess $spdk_tgt_pid
-
-report_test_completion spdkcli_tcp
diff --git a/test/spdkcli/vhost.sh b/test/spdkcli/vhost.sh
index 544158f22..438a46f35 100755
--- a/test/spdkcli/vhost.sh
+++ b/test/spdkcli/vhost.sh
@@ -142,5 +142,3 @@ rm -f /tmp/sample_aio
 timing_exit spdkcli_load_config
 
 killprocess $vhost_tgt_pid
-
-report_test_completion spdk_cli_vhost
diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh
index 11328a689..f00a32794 100755
--- a/test/vhost/initiator/blockdev.sh
+++ b/test/vhost/initiator/blockdev.sh
@@ -99,7 +99,6 @@ timing_exit create_bdev_config
 timing_enter run_spdk_fio
 run_spdk_fio $testdir/bdev.fio --filename=$virtio_bdevs --section=job_randwrite --section=job_randrw \
 	--section=job_write --section=job_rw --spdk_conf=$testdir/bdev.conf
-report_test_completion "vhost_run_spdk_fio"
 timing_exit run_spdk_fio
 
 timing_enter run_spdk_fio_unmap
diff --git a/test/vhost/manual.sh b/test/vhost/manual.sh
index c0d3796cf..02137bed6 100755
--- a/test/vhost/manual.sh
+++ b/test/vhost/manual.sh
@@ -60,7 +60,6 @@ case $1 in
 			--vm=3,$VM_IMAGE,Nvme0n1p6:Nvme0n1p7 \
 			--test-type=spdk_vhost_scsi \
 			--fio-jobs=$WORKDIR/hotplug/fio_jobs/default_integrity.job -x
-		report_test_completion "vhost_hotplug"
 		;;
 	-shr|--scsi-hot-remove)
 		echo 'Running scsi hotremove tests suite...'
diff --git a/test/vhost/vhost.sh b/test/vhost/vhost.sh
index 25cd572eb..9015efb3b 100755
--- a/test/vhost/vhost.sh
+++ b/test/vhost/vhost.sh
@@ -30,10 +30,8 @@ DISKS_NUMBER=$(lspci -mm -n | grep 0108 | tr -d '"' | awk -F " " '{print "0000:"
 WORKDIR=$(readlink -f $(dirname $0))
 
 run_test "vhost_negative" $WORKDIR/other/negative.sh
-report_test_completion "vhost_negative"
 
 run_test "vhost_boot" $WORKDIR/vhost_boot/vhost_boot.sh --vm_image=$VM_IMAGE
-report_test_completion "vhost_boot"
 
 if [ $RUN_NIGHTLY -eq 1 ]; then
 	echo 'Running blk integrity suite...'
@@ -41,22 +39,18 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 	--vm=0,$VM_IMAGE,Nvme0n1p0:RaidBdev0:RaidBdev1:RaidBdev2 \
 	--test-type=spdk_vhost_blk \
 	--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job
-	report_test_completion "nightly_vhost_integrity_blk"
 
 	echo 'Running SCSI integrity suite...'
 	run_test "vhost_scsi_integrity" $WORKDIR/fiotest/fio.sh -x --fio-bin=$FIO_BIN \
 	--vm=0,$VM_IMAGE,Nvme0n1p0:RaidBdev0:RaidBdev1:RaidBdev2 \
 	--test-type=spdk_vhost_scsi \
 	--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job
-	report_test_completion "nightly_vhost_integrity"
 
 	echo 'Running filesystem integrity suite with SCSI...'
 	run_test "vhost_scsi_fs_integrity" $WORKDIR/integrity/integrity_start.sh --ctrl-type=spdk_vhost_scsi --fs="xfs ntfs btrfs ext4"
-	report_test_completion "vhost_fs_integrity_scsi"
 
 	echo 'Running filesystem integrity suite with BLK...'
 	run_test "vhost_blk_fs_integrity" $WORKDIR/integrity/integrity_start.sh --ctrl-type=spdk_vhost_blk --fs="xfs ntfs btrfs ext4"
-	report_test_completion "vhost_fs_integrity_blk"
 
 	if [[ $DISKS_NUMBER -ge 2 ]]; then
 		echo 'Running lvol integrity nightly suite with two cores and two controllers'
@@ -96,7 +90,6 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 
 	echo 'Running readonly tests suite...'
 	run_test "vhost_readonly" $WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1 -x
-	report_test_completion "vhost_readonly"
 
 	echo 'Running migration suite...'
 	run_test "vhost_migration" $WORKDIR/migration/migration.sh -x \
@@ -106,11 +99,9 @@ fi
 echo 'Running lvol integrity suite...'
 run_test "vhost_scsi_lvol_integrity" $WORKDIR/lvol/lvol_test.sh -x --fio-bin=$FIO_BIN \
 --ctrl-type=spdk_vhost_scsi --thin-provisioning
-report_test_completion "vhost_integrity_lvol_scsi"
 
 echo 'Running lvol integrity suite...'
 run_test "vhost_blk_lvol_integrity" $WORKDIR/lvol/lvol_test.sh -x --fio-bin=$FIO_BIN \
 --ctrl-type=spdk_vhost_blk
-report_test_completion "vhost_integrity_lvol_blk"
 
 run_test "spdkcli_vhost" ./test/spdkcli/vhost.sh
diff --git a/test/vmd/vmd.sh b/test/vmd/vmd.sh
index 15195f3c1..dc51f173e 100755
--- a/test/vmd/vmd.sh
+++ b/test/vmd/vmd.sh
@@ -30,7 +30,6 @@ function vmd_fio {
 	PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
 	for bdf in $pci_devs; do
 		fio_nvme $testdir/config/config.fio --filename="trtype=PCIe traddr=${bdf//:/.} ns=1"
-		report_test_completion "bdev_fio"
 	done
 }