diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-11-08 11:21:39 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-11-29 08:22:10 +0000 |
| commit | b8c72a4a8d8bd330ab62dc0c9461cac2b137575b (patch) | |
| tree | b2470923ad4e3612282115ef11ec77e1e1b70f3c /test/ext | |
| parent | 040950a59d53e8802ad31430d67df105939cce4c (diff) | |
make test: create virtualenv under /test/
instead of using build-root, use /test/venv directory for virtualenv
similarly, don't pollute build-root with test-built binaries
Change-Id: I1e63c04037eaee718b27b34ef16c9eb0252afa53
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test/ext')
| -rw-r--r-- | test/ext/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/ext/Makefile b/test/ext/Makefile index 4ae56cfc3eb..de219b1a5dc 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -1,7 +1,7 @@ -VAPI_BINDIR = $(BR)/vapi_test/ +VAPI_BINDIR = $(TEST_DIR)/build/vapi_test/ VAPI_CBIN = $(addprefix $(VAPI_BINDIR), vapi_c_test) VAPI_CPPBIN = $(addprefix $(VAPI_BINDIR), vapi_cpp_test) -VOM_BINDIR = $(BR)/vom_test/ +VOM_BINDIR = $(TEST_DIR)/build/vom_test/ VOM_BIN = $(addprefix $(VOM_BINDIR), vom_test) ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) @@ -9,14 +9,14 @@ VAPI_CPPBIN= endif VAPI_LIBS = \ - -L$(VPP_TEST_INSTALL_PATH)/vpp/lib \ + -L$(VPP_INSTALL_PATH)/vpp/lib \ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient ifneq ($(filter centos opensuse opensuse-tumbleweed opensuse-leap,$(OS_ID)),$(OS_ID)) VAPI_LIBS += -lsubunit endif -FLAGS = -g -Wall -lstdc++ -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR) +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 @@ -55,7 +55,7 @@ $(VOM_BINDIR): LIB_VOM = -lvom VOM_LIBS = \ - -L$(VPP_TEST_INSTALL_PATH)/vom/lib \ + -L$(VPP_INSTALL_PATH)/vom/lib \ -lvom \ -lboost_thread \ -lboost_system \ @@ -69,7 +69,7 @@ VOM_CPPFLAGS = \ $(CPPFLAGS) $(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR) - $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib + $(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) > $@ |