test: fix paths after source code move

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index b3ffaf3..eeb9837 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -147,7 +147,7 @@ else
        @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
        @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
 endif
-       @make -C $(BR) V=$(V) is_build_tool=yes vppapigen-install
+       @make -C $(BR) V=$(V) is_build_tool=yes tools-install
        @touch $@
 
 bootstrap: $(BR)/.bootstrap.ok
@@ -223,10 +223,9 @@ define test
          BR=$(BR) \
          VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
          VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-         VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
-         VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
+         VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
          VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
-         LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
+         LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
          WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
 endef