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

test/unit: move json tests under a single run_test 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
parent d7241356

test/unit/unittest.sh

+8 −6
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ function unittest_iscsi { 
	$valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut $testdir/lib/iscsi/portal_grp.c/portal_grp.conf

}



function unittest_json {

	$valgrind $testdir/lib/json/json_parse.c/json_parse_ut

	$valgrind $testdir/lib/json/json_util.c/json_util_ut

	$valgrind $testdir/lib/json/json_write.c/json_write_ut

	$valgrind $testdir/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut

}



# if ASAN is enabled, use it.  If not use valgrind if installed but allow

# the env variable to override the default shown below.

if [ -z ${valgrind+x} ]; then
@@ -121,6 +128,7 @@ if [ $(uname -s) = Linux ]; then 
fi



run_test "unittest_iscsi" unittest_iscsi

run_test "unittest_json" unittest_json



$valgrind $testdir/lib/sock/sock.c/sock_ut
@@ -141,12 +149,6 @@ fi 


$valgrind $testdir/lib/ioat/ioat.c/ioat_ut



$valgrind $testdir/lib/json/json_parse.c/json_parse_ut

$valgrind $testdir/lib/json/json_util.c/json_util_ut

$valgrind $testdir/lib/json/json_write.c/json_write_ut



$valgrind $testdir/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut



$valgrind $testdir/lib/log/log.c/log_ut



$valgrind $testdir/lib/nvmf/ctrlr.c/ctrlr_ut