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 <dwallacelf@gmail.com>
diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index 07423e5..c51f70b 100644
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -115,7 +115,7 @@
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-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