hs-test: fix coverage integration

- fixed 'make test-cov' not generating gcda files

Type: test

Change-Id: I9745c6501a97248ab343a5dbb39dddcc75f715fd
Signed-off-by: Adrian Villin <[email protected]>

diff --git a/.gitignore b/.gitignore
index 5537f0d..a155056 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -123,6 +123,7 @@ compile_commands.json
 /extras/hs-test/hs-test
 /extras/hs-test/http_server
 /extras/hs-test/.build.ok
+/extras/hs-test/.build.cov.ok
 /extras/hs-test/summary/
 
 # ./configure

diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index b809b17..dc34e53 100644 (file)
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -100,6 +100,9 @@ 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
 
@@ -122,7 +125,7 @@ test-debug: .deps.ok .build_debug.ok
        @bash ./script/compress.sh
 
 .PHONY: test-cov
-test-cov: .deps.ok .build.ok
+test-cov: .deps.ok .build.cov.ok
        -bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
                --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \
                --vppsrc=$(VPPSRC)
@@ -141,9 +144,9 @@ build: .deps.ok build-vpp-release build-go
 
 .PHONY: build-cov
 build-cov: .deps.ok build-vpp-gcov build-go
-       @rm -f .build.vpp
+       @rm -f .build.cov.ok
        bash ./script/build_hst.sh gcov
-       @touch .build.vpp
+       @touch .build.cov.ok
 
 .PHONY: build-debug
 build-debug: .deps.ok build-vpp-debug build-go