From 6f7bf9314b7a61cc155258236ac41b62296b06f8 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 19 Jun 2017 13:44:20 -0700 Subject: [PATCH] test: move JSON-RPC tests to test/util Change-Id: Ib394f110f59df32daf8ac00d54635827a1443369 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/366164 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/lib/Makefile | 2 +- test/unit/lib/Makefile | 2 +- test/{ => unit}/lib/jsonrpc/Makefile | 4 ++-- .../server => unit/lib/jsonrpc/jsonrpc_server.c}/.gitignore | 0 .../server => unit/lib/jsonrpc/jsonrpc_server.c}/Makefile | 2 +- .../lib/jsonrpc/jsonrpc_server.c}/jsonrpc_server_ut.c | 0 unittest.sh | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename test/{ => unit}/lib/jsonrpc/Makefile (95%) rename test/{lib/jsonrpc/server => unit/lib/jsonrpc/jsonrpc_server.c}/.gitignore (100%) rename test/{lib/jsonrpc/server => unit/lib/jsonrpc/jsonrpc_server.c}/Makefile (96%) rename test/{lib/jsonrpc/server => unit/lib/jsonrpc/jsonrpc_server.c}/jsonrpc_server_ut.c (100%) diff --git a/test/lib/Makefile b/test/lib/Makefile index 13eea8a84..782f7a709 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 jsonrpc log nvme nvmf +DIRS-y = bdev blob blobfs env event ioat iscsi json log nvme nvmf .PHONY: all clean $(DIRS-y) diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile index b6bd151a6..287de59f7 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 scsi util +DIRS-y = bdev json jsonrpc scsi util .PHONY: all clean $(DIRS-y) diff --git a/test/lib/jsonrpc/Makefile b/test/unit/lib/jsonrpc/Makefile similarity index 95% rename from test/lib/jsonrpc/Makefile rename to test/unit/lib/jsonrpc/Makefile index c1200ce63..0fc0a2e96 100644 --- a/test/lib/jsonrpc/Makefile +++ b/test/unit/lib/jsonrpc/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 = server +DIRS-y = jsonrpc_server.c .PHONY: all clean $(DIRS-y) diff --git a/test/lib/jsonrpc/server/.gitignore b/test/unit/lib/jsonrpc/jsonrpc_server.c/.gitignore similarity index 100% rename from test/lib/jsonrpc/server/.gitignore rename to test/unit/lib/jsonrpc/jsonrpc_server.c/.gitignore diff --git a/test/lib/jsonrpc/server/Makefile b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile similarity index 96% rename from test/lib/jsonrpc/server/Makefile rename to test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile index 67821c5ae..66dc98156 100644 --- a/test/lib/jsonrpc/server/Makefile +++ b/test/unit/lib/jsonrpc/jsonrpc_server.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)/../../../../..) TEST_FILE = jsonrpc_server_ut.c diff --git a/test/lib/jsonrpc/server/jsonrpc_server_ut.c b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c similarity index 100% rename from test/lib/jsonrpc/server/jsonrpc_server_ut.c rename to test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c diff --git a/unittest.sh b/unittest.sh index 74d391a72..ccfcbc6b3 100755 --- a/unittest.sh +++ b/unittest.sh @@ -53,7 +53,7 @@ $valgrind test/unit/lib/json/json_parse.c/json_parse_ut $valgrind test/unit/lib/json/json_util.c/json_util_ut $valgrind test/unit/lib/json/json_write.c/json_write_ut -$valgrind test/lib/jsonrpc/server/jsonrpc_server_ut +$valgrind test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut $valgrind test/lib/log/log_ut