Imported Upstream version 17.05

[deb_dpdk.git] / mk / rte.sdktest.mk

diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index ddbbbf6..daeea90 100644 (file)
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -46,23 +46,23 @@ DIR := $(shell basename $(RTE_OUTPUT))
 #
 # test: launch auto-tests, very simple for now.
 #
-.PHONY: test fast_test perf_test coverage
+.PHONY: test test-basic test-fast test-perf coverage
 
 PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf
 coverage: BLACKLIST=-$(PERFLIST)
-fast_test: BLACKLIST=-$(PERFLIST)
-perf_test: WHITELIST=$(PERFLIST)
+test-fast: BLACKLIST=-$(PERFLIST)
+test-perf: WHITELIST=$(PERFLIST)
 
-test fast_test perf_test:
+test test-basic test-fast test-perf:
        @mkdir -p $(AUTOTEST_DIR) ; \
        cd $(AUTOTEST_DIR) ; \
        if [ -f $(RTE_OUTPUT)/app/test ]; then \
-               python $(RTE_SDK)/app/test/autotest.py \
+               python $(RTE_SDK)/test/test/autotest.py \
                        $(RTE_OUTPUT)/app/test \
                        $(RTE_TARGET) \
                        $(BLACKLIST) $(WHITELIST); \
        else \
-               echo "No test found, please do a 'make build' first, or specify O=" ; \
+               echo "No test found, please do a 'make test-build' first, or specify O=" ; \
        fi
 
 # this is a special target to ease the pain of running coverage tests
@@ -71,14 +71,14 @@ coverage:
        @mkdir -p $(AUTOTEST_DIR) ; \
        cd $(AUTOTEST_DIR) ; \
        if [ -f $(RTE_OUTPUT)/app/test ]; then \
-               python $(RTE_SDK)/app/cmdline_test/cmdline_test.py \
+               python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
                        $(RTE_OUTPUT)/app/cmdline_test; \
                ulimit -S -n 100 ; \
-               python $(RTE_SDK)/app/test/autotest.py \
+               python $(RTE_SDK)/test/test/autotest.py \
                        $(RTE_OUTPUT)/app/test \
                        $(RTE_TARGET) \
                        $(BLACKLIST) $(WHITELIST) ; \
                $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \
        else \
-               echo "No test found, please do a 'make build' first, or specify O=" ;\
+               echo "No test found, please do a 'make test-build' first, or specify O=" ;\
        fi