From 6501202fa02300ebafdb3d799bbe13e1617ac57c Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 22 Jan 2025 22:43:33 -0500 Subject: [PATCH] build: add golang checkstyle for hs-test to ci checkstyle-test target - Ensure extras/hs-test code is verified for style compliance in the vpp-checkstyle-verify-*-*-* ci jobs Type: make Change-Id: If3900cbc028f0bd38b14fb9dd08841e21fec15da Signed-off-by: Dave Wallace --- Makefile | 5 ++++- extras/hs-test/Makefile | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8ee12bcc416..55731dc491c 100644 --- a/Makefile +++ b/Makefile @@ -666,10 +666,13 @@ test-wipe-all: @$(MAKE) -C test wipe-all # Note: All python venv consolidated in test/Makefile, test/requirements*.txt +# Also, this target is used by ci-management/jjb/scripts/vpp/checkstyle-test.sh, +# thus inclusion of checkstyle-go here to include checkstyle for hs-test +# in the vpp-checkstyle-verify-*-*-* jobs .PHONY: test-checkstyle test-checkstyle: - $(warning test-checkstyle is deprecated. Running checkstyle-python.") @$(MAKE) -C test checkstyle-python-all + @$(MAKE) -C extras/hs-test checkstyle-go # Note: All python venv consolidated in test/Makefile, test/requirements*.txt .PHONY: test-checkstyle-diff diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile index ccccf4fb895..9fbb21c9ccb 100644 --- a/extras/hs-test/Makefile +++ b/extras/hs-test/Makefile @@ -200,14 +200,14 @@ checkstyle-go: .goimports.ok if [ $$status -ne 0 ]; then \ exit $$status; \ elif [ -z "$$output" ]; then \ - echo "*******************************************************************"; \ - echo "Checkstyle OK."; \ - echo "*******************************************************************"; \ + echo "******************************************************************************"; \ + echo "* HST Golang Checkstyle OK."; \ + echo "******************************************************************************"; \ else \ echo "$$output"; \ - echo "*******************************************************************"; \ - echo "Checkstyle failed. Use 'make fixstyle-go' or fix errors manually."; \ - echo "*******************************************************************"; \ + echo "******************************************************************************"; \ + echo "* HST Golang Checkstyle FAILED. Use 'make fixstyle-go' or fix errors manually."; \ + echo "******************************************************************************"; \ exit 1; \ fi -- 2.16.6