aboutsummaryrefslogtreecommitdiffstats
path: root/test/ext/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'test/ext/Makefile')
-rw-r--r--test/ext/Makefile41
1 files changed, 3 insertions, 38 deletions
diff --git a/test/ext/Makefile b/test/ext/Makefile
index a0dc3e7736c..9c9791b1364 100644
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -2,7 +2,6 @@ TEST_EXT_DIR=$(TEST_DIR)/ext
VAPI_BINDIR = $(TEST_BR)/vapi_test
VAPI_CBIN = $(addprefix $(VAPI_BINDIR), /vapi_c_test)
VAPI_CPPBIN = $(addprefix $(VAPI_BINDIR), /vapi_cpp_test)
-VOM_BINDIR = $(TEST_BR)/vom_test
VAPI_LIBS = \
-L$(VPP_INSTALL_PATH)/vpp/lib \
@@ -14,7 +13,7 @@ endif
FLAGS = -g -Wall -lstdc++ -pthread -I$(WS_ROOT)/src -I$(VPP_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR)
CFLAGS = -std=gnu99 $(FLAGS)
-CPPFLAGS = -std=c++11 $(FLAGS) -I$(WS_ROOT)/extras/vom
+CPPFLAGS = -std=c++11 $(FLAGS)
$(VAPI_BINDIR):
@mkdir -p $(VAPI_BINDIR)
@@ -46,50 +45,16 @@ $(VAPI_CPPBIN).d: $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp
$(CXX) -o $@ $(CPPFLAGS) -MM -MT '$(VAPI_CPPBIN)' $(CPPSRC) > $@
endif
-ifneq ($(EXTENDED_TESTS),)
-ifeq ($(filter yes y 1,$(EXTENDED_TESTS)),$(EXTENDED_TESTS))
-VOM_BIN = $(addprefix $(VOM_BINDIR), /vom_test)
-VOM_CPPSRC = $(TEST_EXT_DIR)/vom_test.cpp
-
-$(VOM_BINDIR):
- @mkdir -p $(VOM_BINDIR)
-
-LIB_VOM = -lvom
-VOM_LIBS = \
- -L$(VPP_INSTALL_PATH)/vom/lib \
- -lvom \
- -lboost_thread \
- -lboost_system \
- -lboost_filesystem \
- -lboost_unit_test_framework \
- $(VAPI_LIBS)
-
-VOM_CPPFLAGS = \
- -I $(WS_ROOT)/src/vpp-api/ \
- -DBOOST_LOG_DYN_LINK \
- $(CPPFLAGS)
-
-$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR)
- $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_INSTALL_PATH)/vom/lib
-
-$(VOM_BIN).d: $(VOM_CPPSRC) $(VOM_BINDIR)
- $(CXX) -o $@ $(VOM_CPPFLAGS) -MM -MT '$(VOM_BIN)' $(VOM_CPPSRC) > $@
-endif
-endif
-
.PHONY: test-apps
-test-apps: $(VAPI_CBIN) $(VAPI_CPPBIN) $(VOM_BIN)
+test-apps: $(VAPI_CBIN) $(VAPI_CPPBIN)
.PHONY: clean
clean:
- @rm -rf $(VAPI_BINDIR) $(VOM_BINDIR)
+ @rm -rf $(VAPI_BINDIR)
ifneq ($(MAKECMDGOALS),clean)
-include $(VAPI_CBIN).d
ifneq ($(VAPI_CPPBIN),)
-include $(VAPI_CPPBIN).d
endif
-ifneq ($(VOM_BIN),)
--include $(VOM_BIN).d
-endif
endif