hs-test: point gdb to vpp source files

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

diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index c7fdc4e..f0ec755 100644 (file)
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -19,6 +19,14 @@ ifeq ($(DEBUG),)
 DEBUG=false
 endif
 
+ifeq ($(CPUS),)
+CPUS=1
+endif
+
+ifeq ($(VPPSRC),)
+VPPSRC=$(shell pwd)/../..
+endif
+
 ifeq ($(UBUNTU_CODENAME),)
 UBUNTU_CODENAME=$(shell grep '^UBUNTU_CODENAME=' /etc/os-release | cut -f2- -d=)
 endif
@@ -40,13 +48,18 @@ help:
        @echo " fixstyle             - format .go source files"
        @echo " list-tests           - list all tests"
        @echo
-       @echo "Make arguments:"
+       @echo "make build arguments:"
        @echo " UBUNTU_VERSION           - ubuntu version for docker image"
+       @echo " HST_EXTENDED_TESTS       - build extended tests"
+       @echo
+       @echo "make test arguments:"
        @echo " PERSIST=[true|false]     - whether clean up topology and dockers after test"
        @echo " VERBOSE=[true|false]     - verbose output"
        @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 " VPPSRC=[path-to-vpp-src] - path to vpp source files (for gdb)"
        @echo
        @echo "List of all tests:"
        $(call list_tests)
@@ -64,21 +77,25 @@ build-vpp-debug:
 .PHONY: test
 test: .deps.ok .build.vpp
        @bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
-               --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST)
+               --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
+               --vppsrc=$(VPPSRC)
 
 build-go:
        go build ./tools/http_server
 
 build: .deps.ok build-vpp-release build-go
        @rm -f .build.vpp
-       bash ./script/build.sh release
+       bash ./script/build_hst.sh release
        @touch .build.vpp
 
 build-debug: .deps.ok build-vpp-debug build-go
        @rm -f .build.vpp
-       bash ./script/build.sh debug
+       bash ./script/build_hst.sh debug
        @touch .build.vpp
 
+.deps.ok:
+       @sudo make install-deps
+
 .PHONY: install-deps
 install-deps:
        @rm -f .deps.ok