From bee28afbb29992c4f332dcb319fbc3eacdc6e52b Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 14 Jun 2024 14:59:38 -0400 Subject: hs-test: output docker build command for ci console log - clean up shellcheck warnings - rename extras/hs-test/test script - add -x attribute to compress script for consistancy Type: test Change-Id: I5d1a9d16eeaff18562461b1e445e32ac696266d3 Signed-off-by: Dave Wallace --- extras/hs-test/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extras/hs-test/Makefile') diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile index 07423e527ed..c51f70bfde6 100644 --- a/extras/hs-test/Makefile +++ b/extras/hs-test/Makefile @@ -115,7 +115,7 @@ build-vpp-gcov: test: .deps.ok .build.ok @# '-' ignores the exit status, it is set in compress.sh @# necessary so gmake won't skip executing the bash script - @-bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \ + @-bash ./hs_test.sh --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \ --vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT) @bash ./script/compress.sh @@ -124,14 +124,14 @@ test: .deps.ok .build.ok test-debug: .deps.ok .build_debug.ok @# '-' ignores the exit status, it is set in compress.sh @# necessary so gmake won't skip executing the bash script - @-bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \ + @-bash ./hs_test.sh --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \ --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) \ + @-bash ./hs_test.sh --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \ --vppsrc=$(VPPSRC) @$(MAKE) -C ../.. test-cov-post HS_TEST=1 -- cgit 1.2.3-korg