summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ginchev <pginchev@cisco.com>2016-10-14 10:23:37 +0300
committerJohn Lo <loj@cisco.com>2016-10-18 14:36:19 +0000
commit53194292b0e4d0a0b0a7a6defe59e6e77548bc55 (patch)
tree6503219ab526e7c9ef11d79221e95fe6ba5d0e3c
parent064f55da7798f3a4c790b656dba71b32a3b82a5c (diff)
Fix test target build
Change-Id: Ib06b40292858f32df9c62e747808e0ef140bd9dd Signed-off-by: Peter Ginchev <pginchev@cisco.com>
-rw-r--r--Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 4b7170d27ff..93277beca11 100644
--- a/Makefile
+++ b/Makefile
@@ -196,18 +196,22 @@ define test
V=$(V) TEST=$(TEST)
endef
-test:
+test: bootstrap
ifeq ($(OS_ID),ubuntu)
- @sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+ @if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
+ sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
+ fi
endif
- @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite plugins-install vpp-install vpp-api-test-install
+ @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-api-install plugins-install vpp-install vpp-api-test-install
$(call test,vpp_lite)
-test-debug:
+test-debug: bootstrap
ifeq ($(OS_ID),ubuntu)
- @sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+ @if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
+ sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
+ fi
endif
- @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug plugins-install vpp-install vpp-api-test-install
+ @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-api-install plugins-install vpp-install vpp-api-test-install
$(call test,vpp_lite_debug)
retest: