From df009d732308b03144579fde5f8bc754b5781c7a Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Wed, 29 Mar 2017 13:04:05 -0700
Subject: [PATCH] test/iscsi: move iSCSI unit tests to unittest.sh

Change-Id: I19f3f5485bfbf3dec275acddbc45786f76cd4198
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 autotest.sh             |  2 --
 test/lib/iscsi/iscsi.sh | 23 -----------------------
 unittest.sh             |  5 +++++
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100755 test/lib/iscsi/iscsi.sh

diff --git a/autotest.sh b/autotest.sh
index 6500fc6707..01093a6cc7 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -138,8 +138,6 @@ if [ $(uname -s) = Linux ] && [ $SPDK_TEST_ISCSI -eq 1 ]; then
 	run_test ./test/iscsi_tgt/rbd/rbd.sh
 	run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
 	timing_exit iscsi_tgt
-
-	run_test test/lib/iscsi/iscsi.sh
 fi
 
 if [ $SPDK_TEST_BLOBFS -eq 1 ]; then
diff --git a/test/lib/iscsi/iscsi.sh b/test/lib/iscsi/iscsi.sh
deleted file mode 100755
index 7f021fe0dc..0000000000
--- a/test/lib/iscsi/iscsi.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-testdir=$(readlink -f $(dirname $0))
-rootdir="$testdir/../../.."
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter iscsi
-
-timing_enter param
-$testdir/param/param_ut
-timing_exit param
-
-timing_enter target_node
-$testdir/target_node/target_node_ut $testdir/target_node/target_node.conf
-timing_exit target_node
-
-timing_enter pdu
-$testdir/pdu/pdu
-timing_exit pdu
-
-timing_exit iscsi
diff --git a/unittest.sh b/unittest.sh
index b7f1a02bdf..927b8d0081 100755
--- a/unittest.sh
+++ b/unittest.sh
@@ -43,6 +43,11 @@ $valgrind test/lib/scsi/lun/lun_ut
 $valgrind test/lib/scsi/scsi_bdev/scsi_bdev_ut
 $valgrind test/lib/scsi/scsi_nvme/scsi_nvme_ut
 
+# TODO: fix valgrind warnings and add $valgrind to iSCSI tests
+test/lib/iscsi/param/param_ut
+test/lib/iscsi/target_node/target_node_ut test/lib/iscsi/target_node/target_node.conf
+test/lib/iscsi/pdu/pdu
+
 $valgrind test/lib/util/bit_array/bit_array_ut
 $valgrind test/lib/util/io_channel/io_channel_ut
 $valgrind test/lib/util/string/string_ut