X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;fp=test%2FMakefile;h=c75471c772c4ad506101ce30e90c528baa4575f0;hb=4e545a8b013e60f2ff59254cb3fe435012d8fe5a;hp=8ffb30a24783dcdaf875f5508b35afdcbdf1fbf9;hpb=82ba4b9999ca8e09461315a919b36a66641a6c7d;p=ric-app%2Fadmin.git

diff --git a/test/Makefile b/test/Makefile
index 8ffb30a..c75471c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -30,7 +30,7 @@ E2AP_C_DIR=../src/E2AP-c
 SUBSCR_DIR = ../src/E2AP-c/subscription
 E2SM_DIR=../src/E2SM
 X2AP_DIR=../src/X2AP
-JSON_DIR=../src/json
+#JSON_DIR=../src/json
 A1= ./a1
 PROTECTOR=../src/protector-plugin
 
@@ -44,7 +44,7 @@ SUBSCRFLAGS= -I$(SUBSCR_DIR)  -I$(ASN1C_DIR)
 E2SMFLAGS = -I$(E2SM_DIR) -I$(ASN1C_DIR)/
 X2FLAGS= -I$(X2AP_DIR) -I$(ASN1C_DIR)/
 A1FLAGS = -I$(A1)
-JSONFLAGS= -I$(JSON_DIR)
+#JSONFLAGS= -I$(JSON_DIR)
 PROTECTORFLAGS= -I$(PROTECTOR)
 
 LIBS= -lrmr_nng  -lnng -lpthread -lm 
@@ -63,7 +63,7 @@ SUBSCR_SRC= $(wildcard $(SUBSCR_DIR)/*.cc)
 E2SM_SRC= $(wildcard $(E2SM_DIR)/*.cc)
 X2AP_SRC = $(wildcard $(X2AP_DIR)/*.cc)
 ASN1C_SRC = $(wildcard $(ASN1C_DIR)/*.c)
-JSON_SRC = $(wildcard $(JSON_DIR)/*.cc)
+#JSON_SRC = $(wildcard $(JSON_DIR)/*.cc)
 PROTECTOR_SRC = $(wildcard $(PROTECTOR)/*.cc)
 
 #===========================================
@@ -75,7 +75,7 @@ SUBSCRIPTION_FLOW_UNIT_TEST = unit_test_subscription_flow.o
 E2AP_IND_UNIT_TEST= unit_test_e2ap_indication.o
 E2AP_CTRL_UNIT_TEST= unit_test_e2ap_control.o
 E2SM_UNIT_TEST=unit_test_e2sm.o
-JSON_UNIT_TEST = unit_test_json.o
+#JSON_UNIT_TEST = unit_test_json.o
 SGNB_ADD_REQ_UNIT_TEST = unit_test_sgnb_addition_request.o
 MESSAGE_PROC_UNIT_TEST = unit_test_message_processor.o
 SLIDING_WINDOW_UNIT_TEST = unit_test_sliding_window.o
@@ -98,7 +98,7 @@ E2AP_C_OBJ = $(E2AP_C_SRC:.cc=.o)
 E2SM_OBJ = $(E2SM_SRC:.cc=.o)
 ASN1C_MODULES = $(ASN1C_SRC:.c=.o)
 X2AP_OBJ = $(X2AP_SRC:.cc=.o)
-JSON_OBJ = $(JSON_SRC:.cc=.o)
+#JSON_OBJ = $(JSON_SRC:.cc=.o)
 PROTECTOR_OBJ = $(PROTECTOR_SRC:.cc=.o)
 
 #===========================================
@@ -107,7 +107,7 @@ $(XAPP_UTILS_OBJ) $(XAPP_UNIT_TEST)  :export CPPFLAGS= $(BASEFLAGS) $(XAPPFLAGS)
 
 $(A1_OBJ)  $(MOCK_A1SERVER_OBJ) $(JSON_UNIT_TEST) :export CPPFLAGS= $(BASEFLAGS) $(A1FLAGS) $(XAPPFLAGS)
 
-$(XAPP_MPROC_OBJ) $(MESSAGE_PROC_UNIT_TEST) $(MOCK_SUB_CLIENT_OBJ):  export CPPFLAGS=$(BASEFLAGS) $(JSONFLAGS) $(XAPPFLAGS) $(E2FLAGS) $(X2FLAGS) $(SUBSCRFLAGS) $(PLUGINFLAGS) $(PROTECTORFLAGS) $(E2SMFLAGS)
+$(XAPP_MPROC_OBJ) $(MESSAGE_PROC_UNIT_TEST) $(MOCK_SUB_CLIENT_OBJ):  export CPPFLAGS=$(BASEFLAGS)  $(XAPPFLAGS) $(E2FLAGS) $(X2FLAGS) $(SUBSCRFLAGS) $(PLUGINFLAGS) $(PROTECTORFLAGS) $(E2SMFLAGS)
 
 $(SUBSCRIPTION_FLOW_UNIT_TEST): export CPPFLAGS=$(BASEFLAGS) $(SUBSCRFLAGS) $(E2SMFLAGS)
 
@@ -125,9 +125,9 @@ $(PLUGINS_OBJ) : export CPPFLAGS = $(BASEFLAGS) $(JSONFLAGS)
 
 $(MOCK_E2TERM_OBJ): export CPPFLAGS = $(BASEFLAGS) $(SUBSCRFLAGS) $(E2FLAGS) $(E2SMFLAGS) $(XAPPFLAGS) $(X2FLAGS)
 
-$(JSON_OBJ) $(JSON_UNIT_TEST): export CPPFLAGS= $(BASEFLAGS) $(JSONFLAGS)
+#$(JSON_OBJ) $(JSON_UNIT_TEST): export CPPFLAGS= $(BASEFLAGS) $(JSONFLAGS)
 
-$(PROTECTOR_OBJ) $(SLIDING_WINDOW_UNIT_TEST) $(PROTECTOR_UNIT_TEST) $(ADMISSION_UNIT_TEST): export CPPFLAGS = $(BASEFLAGS) $(PLUGINFLAGS) $(JSONFLAGS) $(PROTECTORFLAGS) $(X2FLAGS)
+$(PROTECTOR_OBJ) $(SLIDING_WINDOW_UNIT_TEST) $(PROTECTOR_UNIT_TEST) $(ADMISSION_UNIT_TEST): export CPPFLAGS = $(BASEFLAGS) $(PLUGINFLAGS)  $(PROTECTORFLAGS) $(X2FLAGS)
 
 
 TEST_XAPP: $(XAPP_UTILS_OBJ) $(XAPP_UNIT_TEST)
@@ -157,7 +157,7 @@ TEST_JSON:  $(JSON_OBJ)  $(JSON_UNIT_TEST)
 TEST_MESSAGE_PROCESSOR: $(MESSAGE_PROC_UNIT_TEST) $(XAPP_MPROC_OBJ) $(ASN1C_MODULES) $(E2AP_C_OBJ) $(PROTECTOR_OBJ) $(E2SM_OBJ) $(X2AP_OBJ) $(SUBSCR_OBJ) $(JSON_OBJ) $(PLUGINS_OBJ)
 	$(CXX)  -o $@  $^ $(LIBS)  $(LOGLIBS)
 
-TEST_ADMISSION:  $(ADMISSION_UNIT_TEST)  $(PROTECTOR_OBJ) $(X2AP_OBJ) $(ASN1C_MODULES) $(PLUGINS_OBJ) $(JSON_OBJ)
+TEST_ADMISSION:  $(ADMISSION_UNIT_TEST)  $(PROTECTOR_OBJ) $(X2AP_OBJ) $(ASN1C_MODULES) $(PLUGINS_OBJ) 
 	$(CXX)  -o $@  $^ $(LIBS)  $(LOGLIBS)
 
 TEST_PROTECTOR_PLUGIN: $(PROTECTOR_UNIT_TEST) $(PROTECTOR_OBJ) $(X2AP_OBJ) $(ASN1C_MODULES) $(PLUGINS_OBJ) $(JSON_OBJ)
@@ -171,7 +171,7 @@ mock-e2term-server: $(XAPP_UTILS_OBJ) $(E2AP_C_OBJ) $(SUBSCR_OBJ) $(E2SM_OBJ) $(
 	$(CXX)  -o $@  $^ $(LIBS)  $(LOGLIBS) $(CPPFLAGS)
 
 
-mock-a1-server: $(A1_OBJ) $(MOCK_A1SERVER_OBJ) $(XAPP_UTILS_OBJ) 
+mock-a1-tool: $(A1_OBJ) $(MOCK_A1SERVER_OBJ) $(XAPP_UTILS_OBJ) 
 	$(CXX)  -o $@  $^ $(LIBS)  $(LOGLIBS)
 
 all_tests: TEST_XAPP TEST_SUBSCRIPTION TEST_ADMISSION TEST_E2AP_INDICATION TEST_E2AP_CONTROL TEST_E2SM TEST_X2_SGNB TEST_JSON TEST_SUBSCRIPTION_FLOW TEST_MESSAGE_PROCESSOR TEST_SLIDING_WINDOW TEST_PROTECTOR_PLUGIN
@@ -180,5 +180,5 @@ all_tests: TEST_XAPP TEST_SUBSCRIPTION TEST_ADMISSION TEST_E2AP_INDICATION TEST_
 install: mock-e2term-server
 	install -D mock-e2term-server /usr/local/bin/mock-e2term-server
 clean:
-	-rm TEST_* *.o e2e-test-client mock-e2term-server e2e-perf-client e2e-perf-server mock-a1-server
+	-rm TEST_* *.o e2e-test-client mock-e2term-server e2e-perf-client e2e-perf-server mock-a1-tool
 	-cd ../src && make -f ../src/Makefile clean