octeon: add clear counters for port and queues

[vpp.git] / extras / hs-test / Makefile

diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index e247bf4..d459d9d 100644 (file)
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -16,6 +16,10 @@ ifeq ($(TEST),)
 TEST=all
 endif
 
+ifeq ($(TEST-HS),)
+TEST-HS=all
+endif
+
 ifeq ($(DEBUG),)
 DEBUG=false
 endif
@@ -53,6 +57,7 @@ help:
        @echo " test                 - run tests"
        @echo " test-debug           - run tests (vpp debug image)"
        @echo " build                - build test infra"
+       @echo " build-cov                        - coverage build of VPP and Docker images"
        @echo " build-debug          - build test infra (vpp debug image)"
        @echo " build-go             - just build golang files"
        @echo " fixstyle             - format .go source files"
@@ -68,7 +73,7 @@ help:
        @echo " UNCONFIGURE=[true|false] - unconfigure selected test"
        @echo " DEBUG=[true|false]       - attach VPP to GDB"
        @echo " TEST=[test-name]         - specific test to run"
-       @echo " CPUS=[n-cpus]            - number of cpus to run with vpp"
+       @echo " CPUS=[n-cpus]            - number of cpus to allocate to VPP and containers"
        @echo " VPPSRC=[path-to-vpp-src] - path to vpp source files (for gdb)"
        @echo " PARALLEL=[n-cpus]        - number of test processes to spawn to run in parallel"
        @echo " REPEAT=[n]               - repeat tests up to N times or until a failure occurs"
@@ -82,15 +87,22 @@ list-tests:
 
 .PHONY: build-vpp-release
 build-vpp-release:
-       @make -C ../.. build-release
+       @$(MAKE) -C ../.. build-release
 
 .PHONY: build-vpp-debug
 build-vpp-debug:
-       @make -C ../.. build
+       @$(MAKE) -C ../.. build
+
+.PHONY: build-vpp-gcov
+build-vpp-gcov:
+       @$(MAKE) -C ../.. build-vpp-gcov
 
 .build.ok: build
        @touch .build.ok
 
+.build.cov.ok: build-vpp-gcov
+       @touch .build.cov.ok
+
 .build_debug.ok: build-debug
        @touch .build.ok
 
@@ -112,6 +124,14 @@ test-debug: .deps.ok .build_debug.ok
                --vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT)
        @bash ./script/compress.sh
 
+.PHONY: test-cov
+test-cov: .deps.ok .build.cov.ok
+       -bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
+               --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \
+               --vppsrc=$(VPPSRC)
+       @$(MAKE) -C ../.. test-cov-post HS_TEST=1
+       @bash ./script/compress.sh
+
 .PHONY: build-go
 build-go:
        go build ./tools/http_server
@@ -122,6 +142,12 @@ build: .deps.ok build-vpp-release build-go
        bash ./script/build_hst.sh release
        @touch .build.ok
 
+.PHONY: build-cov
+build-cov: .deps.ok build-vpp-gcov build-go
+       @rm -f .build.cov.ok
+       bash ./script/build_hst.sh gcov
+       @touch .build.cov.ok
+
 .PHONY: build-debug
 build-debug: .deps.ok build-vpp-debug build-go
        @rm -f .build.ok
@@ -129,7 +155,7 @@ build-debug: .deps.ok build-vpp-debug build-go
        @touch .build.ok
 
 .deps.ok:
-       @sudo make install-deps
+       @sudo $(MAKE) install-deps
 
 .PHONY: install-deps
 install-deps: