summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2019-02-07 19:56:50 +0100
committerDamjan Marion <dmarion@me.com>2019-02-14 17:23:21 +0000
commit593635d4fa97ec8c26b0d2a9c9ccc17007354136 (patch)
tree5f0d8e3e0318ef38cd93195800161856a0d94e76
parent752f5b4302317e2ccfbd1903d31d3e857d719c4d (diff)
make test: make test-ext working again
Change-Id: Ib30d0c6b8794488119f258f7617fce494aa28f1f Signed-off-by: Klement Sekera <ksekera@cisco.com>
-rw-r--r--Makefile1
-rw-r--r--test/Makefile12
2 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index da85e9b3e94..015db529431 100644
--- a/Makefile
+++ b/Makefile
@@ -435,6 +435,7 @@ test-wipe-doc:
@make -C test wipe-doc
test-cov:
+ @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_gcov,cov)
diff --git a/test/Makefile b/test/Makefile
index 9113d15f703..a032318dbca 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -178,10 +178,10 @@ retest: verify-test-dir sanity reset
shell: verify-test-dir $(PAPI_INSTALL_DONE)
@echo "source $(VENV_PATH)/bin/activate;\
echo '***';\
- echo _BUILD_DIR=$(VPP_BUILD_DIR);\
- echo _BIN=$(VPP_BIN);\
- echo _PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
- echo _INSTALL_PATH=$(VPP_INSTALL_PATH);\
+ echo VPP_BUILD_DIR=$(VPP_BUILD_DIR);\
+ echo VPP_BIN=$(VPP_BIN);\
+ echo VPP_PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
+ echo VPP_INSTALL_PATH=$(VPP_INSTALL_PATH);\
echo EXTERN_TESTS=$(EXTERN_TESTS);\
echo EXTERN_PLUGINS=$(EXTERN_PLUGINS);\
echo EXTERN_COV_DIR=$(EXTERN_COV_DIR);\
@@ -213,11 +213,11 @@ wipe-doc:
@make -C doc wipe BR=$(BR)
cov: wipe-cov reset ext verify-test-dir $(PAPI_INSTALL_DONE)
- @lcov --zerocounters --directory $(_BUILD_DIR)
+ @lcov --zerocounters --directory $(VPP_BUILD_DIR)
@test -z "$(EXTERN_COV_DIR)" || lcov --zerocounters --directory $(EXTERN_COV_DIR)
$(call retest-func)
@mkdir $(BUILD_COV_DIR)
- @lcov --capture --directory $(_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
+ @lcov --capture --directory $(VPP_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
@test -z "$(EXTERN_COV_DIR)" || lcov --capture --directory $(EXTERN_COV_DIR) --output-file $(BUILD_COV_DIR)/extern-coverage.info
@genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
@test -z "$(EXTERN_COV_DIR)" || genhtml $(BUILD_COV_DIR)/extern-coverage.info --output-directory $(BUILD_COV_DIR)/extern-html