summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
3ee4404)
This patch adds plugin path to vpp commandline arguments
when 'make test' is run.
Hence, test cases can test plugins.
Change-Id: Ib90efa1f62e03b45b84533c49c7a5d040aa8cddf
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
@make -C test \
VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
@make -C test \
VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
+ VPP_TEST_PLUGIN_PATH=$(BR)/install-$(1)-native/plugins/lib64/vpp_plugins \
V=$(V) TEST=$(TEST)
endef
V=$(V) TEST=$(TEST)
endef
ifeq ($(OS_ID),ubuntu)
@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
endif
ifeq ($(OS_ID),ubuntu)
@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
endif
- @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-install vpp-api-test-install
+ @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite plugins-install vpp-install vpp-api-test-install
$(call test,vpp_lite)
test-debug:
ifeq ($(OS_ID),ubuntu)
@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
endif
$(call test,vpp_lite)
test-debug:
ifeq ($(OS_ID),ubuntu)
@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
endif
- @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-install vpp-api-test-install
+ @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug plugins-install vpp-install vpp-api-test-install
$(call test,vpp_lite_debug)
retest:
$(call test,vpp_lite_debug)
retest:
@classmethod
def setUpConstants(cls):
cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
@classmethod
def setUpConstants(cls):
cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
+ cls.plugin_path = os.getenv('VPP_TEST_PLUGIN_PATH')
cls.vpp_api_test_bin = os.getenv("VPP_TEST_API_TEST_BIN",
"vpp-api-test")
cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon", "api-segment", "{",
"prefix", "unittest", "}"]
cls.vpp_api_test_bin = os.getenv("VPP_TEST_API_TEST_BIN",
"vpp-api-test")
cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon", "api-segment", "{",
"prefix", "unittest", "}"]
+ if cls.plugin_path is not None:
+ cls.vpp_cmdline.extend(["plugin_path", cls.plugin_path])
+
cls.vpp_api_test_cmdline = [cls.vpp_api_test_bin, "chroot", "prefix",
"unittest"]
try:
cls.vpp_api_test_cmdline = [cls.vpp_api_test_bin, "chroot", "prefix",
"unittest"]
try: