test: use spdk.unittest.mk for json unit tests
This includes removing the json.unittest.mk that these unit tests were using previously. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Icfa2e5a5554b686002407d1ef5328a0aecb442f1 Reviewed-on: https://review.gerrithub.io/399723 Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Jim Harris
parent
3465da9302
commit
f8ad4dca9d
@ -1,64 +0,0 @@
|
||||
#
|
||||
# BSD LICENSE
|
||||
#
|
||||
# Copyright (c) Intel Corporation.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Intel Corporation nor the names of its
|
||||
# contributors may be used to endorse or promote products derived
|
||||
# from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
||||
|
||||
JSON_DIR := $(SPDK_ROOT_DIR)/lib/json
|
||||
JSONRPC_DIR := $(SPDK_ROOT_DIR)/lib/jsonrpc
|
||||
|
||||
SPDK_LIB_LIST = json util log
|
||||
|
||||
C_SRCS = $(TEST_FILE) $(OTHER_FILES)
|
||||
|
||||
CFLAGS += -I$(JSON_DIR)
|
||||
CFLAGS += -I$(JSONRPC_DIR)
|
||||
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
|
||||
CFLAGS += -I$(SPDK_ROOT_DIR)/test
|
||||
|
||||
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
|
||||
|
||||
APP = $(TEST_FILE:.c=)
|
||||
|
||||
all: $(APP)
|
||||
|
||||
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
|
||||
$(LINK_C)
|
||||
|
||||
clean:
|
||||
$(CLEAN_C) $(APP)
|
||||
|
||||
%.o: $(JSON_DIR)/%.c %.d $(MAKEFILE_LIST)
|
||||
$(COMPILE_C)
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
|
||||
@ -40,7 +40,7 @@ C_SRCS = $(TEST_FILE)
|
||||
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
|
||||
CFLAGS += -I$(SPDK_ROOT_DIR)/test
|
||||
|
||||
SPDK_LIB_LIST = util log spdk_mock
|
||||
SPDK_LIB_LIST += util log spdk_mock
|
||||
|
||||
LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)
|
||||
|
||||
|
||||
@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
|
||||
|
||||
TEST_FILE = json_parse_ut.c
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
#include "spdk_cunit.h"
|
||||
|
||||
#include "json_parse.c"
|
||||
#include "json/json_parse.c"
|
||||
|
||||
static uint8_t g_buf[1000];
|
||||
static void *g_end;
|
||||
|
||||
@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
|
||||
|
||||
TEST_FILE = json_util_ut.c
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
#include "spdk_cunit.h"
|
||||
|
||||
#include "json_util.c"
|
||||
#include "json/json_util.c"
|
||||
|
||||
#define NUM_SETUP(x) \
|
||||
snprintf(buf, sizeof(buf), "%s", x); \
|
||||
|
||||
@ -34,6 +34,5 @@
|
||||
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
|
||||
|
||||
TEST_FILE = json_write_ut.c
|
||||
OTHER_FILES = json_parse.c
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
|
||||
|
||||
@ -35,7 +35,8 @@
|
||||
|
||||
#include "spdk_cunit.h"
|
||||
|
||||
#include "json_write.c"
|
||||
#include "json/json_write.c"
|
||||
#include "json/json_parse.c"
|
||||
|
||||
#include "spdk/util.h"
|
||||
|
||||
|
||||
@ -34,5 +34,6 @@
|
||||
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
|
||||
|
||||
TEST_FILE = jsonrpc_server_ut.c
|
||||
SPDK_LIB_LIST = json
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
#include "spdk_cunit.h"
|
||||
|
||||
#include "jsonrpc_server.c"
|
||||
#include "jsonrpc/jsonrpc_server.c"
|
||||
|
||||
#define MAX_PARAMS 100
|
||||
#define MAX_REQS 100
|
||||
|
||||
Loading…
Reference in New Issue
Block a user