diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-12-28 15:14:46 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2016-12-28 15:21:59 +0100 |
| commit | 37d77e9edbf845de23d41c343c11b34a575761ff (patch) | |
| tree | f1e82da7250aa34cbd21eec7d432b4dcc72a5dfe | |
| parent | 7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 (diff) | |
test: fix paths after source code move
Change-Id: I3100260bb697f9af2f73ad3777e8b27069c5babe
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | test/Makefile | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -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 diff --git a/test/Makefile b/test/Makefile index 54fe0582..204afd38 100644 --- a/test/Makefile +++ b/test/Makefile @@ -30,7 +30,7 @@ $(PIP_PATCH_DONE): $(PIP_INSTALL_DONE) @touch $@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE) - @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/vpp-api/python && python setup.py install" + @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/src/vpp-api/python && python setup.py install" @touch $@ define retest-func |