From fe4d1dce58bb46d2dc91ddd64a57522490b49ee7 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 4 Dec 2019 14:00:27 -0700
Subject: [PATCH] test/env: convert program calls to run_test

allows us to remove a lot of extra timing_* calls.

The next several commits are aimed at converting the majority of the
tests to this single framework of using the run_test suite or run_test
case function calls. Hopefully it makes it much easier to understand the
logs over time.

Change-Id: I6d46982108be469a05f70c24b373e60726aa061e
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476805
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@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>
---
 test/env/env.sh | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/test/env/env.sh b/test/env/env.sh
index 22ff87db2..e73be491e 100755
--- a/test/env/env.sh
+++ b/test/env/env.sh
@@ -4,19 +4,10 @@ testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 
-timing_enter memory
-$testdir/memory/memory_ut
-timing_exit memory
+run_test "case" "env_memory" $testdir/memory/memory_ut
+run_test "case" "env_vtophys" $testdir/vtophys/vtophys
+run_test "case" "env_pci" $testdir/pci/pci_ut
 
-timing_enter vtophys
-$testdir/vtophys/vtophys
-timing_exit vtophys
-
-timing_enter pci
-$testdir/pci/pci_ut
-timing_exit pci
-
-timing_enter env_dpdk_post_init
 argv="-c 0x1 "
 if [ $(uname) = Linux ]; then
 	# The default base virtaddr falls into a region reserved by ASAN.
@@ -27,15 +18,12 @@ if [ $(uname) = Linux ]; then
 	# this implicitly.
 	argv+="--base-virtaddr=0x200000000000"
 fi
-$testdir/env_dpdk_post_init/env_dpdk_post_init $argv
-timing_exit env_dpdk_post_init
+run_test "case" "env_dpdk_post_init" $testdir/env_dpdk_post_init/env_dpdk_post_init $argv
 
 if [ $(uname) = Linux ]; then
 	# This tests the --match-allocations DPDK parameter which is only
 	# supported on Linux
-	timing_enter mem_callbacks
-	$testdir/mem_callbacks/mem_callbacks
-	timing_exit mem_callbacks
+	run_test "case" "env_mem_callbacks" $testdir/mem_callbacks/mem_callbacks
 fi
 
 report_test_completion "env"