jvpp: log error output of Java process on test failure

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 6dd2fc2..c893e02 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,19 +84,21 @@ RPM_DEPENDS += apr-devel
 RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check check-devel
 RPM_DEPENDS += boost boost-devel
-RPM_DEPENDS += subunit subunit-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
-RPM_DEPENDS += mbedtls-devel
 
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+       RPM_DEPENDS += subunit subunit-devel
        RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel python2-ply
        RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS += mbedtls-devel
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+       RPM_DEPENDS += subunit subunit-devel
        RPM_DEPENDS += compat-openssl10-devel
        RPM_DEPENDS += python2-devel python2-ply
        RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS += mbedtls-devel
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
        RPM_DEPENDS += openssl-devel
@@ -408,14 +410,12 @@ define run
        @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
        @echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
        @cd $(STARTUP_DIR) && \
-         sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \
-           plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
+         sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF)
 endef
 else
 define run
        @cd $(STARTUP_DIR) && \
-         sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \
-           plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
+         sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//')
 endef
 endif