From 634786e5833b32e0d2b4aee51da8762c79973c66 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Tue, 27 Sep 2016 10:51:29 -0700
Subject: [PATCH] test/io_channel: add to autotest and unittest.sh

Also remove libspdk_util.a from the io_channel_ut linker command, since
it already includes the tested C file directly and doesn't depend on any
other util library functions.

Change-Id: I4b3fc4d57b5af4524b53664365f6ba52686e4b80
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 test/lib/util/io_channel/Makefile | 1 -
 test/lib/util/util.sh             | 1 +
 unittest.sh                       | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/lib/util/io_channel/Makefile b/test/lib/util/io_channel/Makefile
index 4c32f8e303..90974e6a05 100644
--- a/test/lib/util/io_channel/Makefile
+++ b/test/lib/util/io_channel/Makefile
@@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
-	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
 	     $(SPDK_ROOT_DIR)/lib/cunit/libspdk_cunit.a
 
 CFLAGS += $(DPDK_INC)
diff --git a/test/lib/util/util.sh b/test/lib/util/util.sh
index 22d5731d18..665fbd6227 100755
--- a/test/lib/util/util.sh
+++ b/test/lib/util/util.sh
@@ -9,5 +9,6 @@ source $rootdir/scripts/autotest_common.sh
 timing_enter util
 
 $testdir/bit_array/bit_array_ut
+$testdir/io_channel/io_channel_ut
 
 timing_exit util
diff --git a/unittest.sh b/unittest.sh
index 2c30419544..6f34b39ea3 100755
--- a/unittest.sh
+++ b/unittest.sh
@@ -49,5 +49,7 @@ test/lib/scsi/lun/lun_ut
 #test/lib/scsi/scsi_bdev/scsi_bdev_ut
 
 make -C test/lib/util/bit_array CONFIG_WERROR=y
+make -C test/lib/util/io_channel CONFIG_WERROR=y
 
 test/lib/util/bit_array/bit_array_ut
+test/lib/util/io_channel/io_channel_ut