From a4a8c40fe22433c2c9a1b6892c7170a1ae679279 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 21 Jun 2017 14:27:05 -0700 Subject: [PATCH] test: move IOAT library unit test to test/unit Change-Id: I9b4ec6cf5a936c081be4a0ea6caea8a085765413 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/366516 Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker --- test/lib/Makefile | 2 +- test/unit/lib/Makefile | 2 +- test/{ => unit}/lib/ioat/Makefile | 4 ++-- test/{lib/ioat/unit => unit/lib/ioat/ioat.c}/.gitignore | 0 test/{lib/ioat/unit => unit/lib/ioat/ioat.c}/Makefile | 2 +- test/{lib/ioat/unit => unit/lib/ioat/ioat.c}/ioat_ut.c | 0 unittest.sh | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename test/{ => unit}/lib/ioat/Makefile (96%) rename test/{lib/ioat/unit => unit/lib/ioat/ioat.c}/.gitignore (100%) rename test/{lib/ioat/unit => unit/lib/ioat/ioat.c}/Makefile (97%) rename test/{lib/ioat/unit => unit/lib/ioat/ioat.c}/ioat_ut.c (100%) diff --git a/test/lib/Makefile b/test/lib/Makefile index 7941b382c6..2458dd0fcd 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = bdev blob blobfs env event ioat iscsi json log nvme +DIRS-y = bdev blob blobfs env event iscsi json log nvme .PHONY: all clean $(DIRS-y) diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile index 74cadb7196..08da133c8b 100644 --- a/test/unit/lib/Makefile +++ b/test/unit/lib/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = bdev json jsonrpc nvme nvmf scsi util +DIRS-y = bdev ioat json jsonrpc nvme nvmf scsi util .PHONY: all clean $(DIRS-y) diff --git a/test/lib/ioat/Makefile b/test/unit/lib/ioat/Makefile similarity index 96% rename from test/lib/ioat/Makefile rename to test/unit/lib/ioat/Makefile index 61530673bb..8d982710eb 100644 --- a/test/lib/ioat/Makefile +++ b/test/unit/lib/ioat/Makefile @@ -31,10 +31,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = unit +DIRS-y = ioat.c .PHONY: all clean $(DIRS-y) diff --git a/test/lib/ioat/unit/.gitignore b/test/unit/lib/ioat/ioat.c/.gitignore similarity index 100% rename from test/lib/ioat/unit/.gitignore rename to test/unit/lib/ioat/ioat.c/.gitignore diff --git a/test/lib/ioat/unit/Makefile b/test/unit/lib/ioat/ioat.c/Makefile similarity index 97% rename from test/lib/ioat/unit/Makefile rename to test/unit/lib/ioat/ioat.c/Makefile index cfe4d2990e..51d04789c9 100644 --- a/test/lib/ioat/unit/Makefile +++ b/test/unit/lib/ioat/ioat.c/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk TEST_FILE = ioat_ut.c diff --git a/test/lib/ioat/unit/ioat_ut.c b/test/unit/lib/ioat/ioat.c/ioat_ut.c similarity index 100% rename from test/lib/ioat/unit/ioat_ut.c rename to test/unit/lib/ioat/ioat.c/ioat_ut.c diff --git a/unittest.sh b/unittest.sh index 532ae1a63a..cf80edfa7a 100755 --- a/unittest.sh +++ b/unittest.sh @@ -47,7 +47,7 @@ $valgrind test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut $valgrind test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut $valgrind test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut -$valgrind test/lib/ioat/unit/ioat_ut +$valgrind test/unit/lib/ioat/ioat.c/ioat_ut $valgrind test/unit/lib/json/json_parse.c/json_parse_ut $valgrind test/unit/lib/json/json_util.c/json_util_ut