hs-test: change convention for skipping tests

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index ed7d5b2..d82a625 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 export WS_ROOT=$(CURDIR)
 export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
-SHELL:=/bin/bash
+SHELL:=$(shell which bash)
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
@@ -106,6 +106,12 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11)
        DEB_DEPENDS += virtualenv
        DEB_DEPENDS += clang clang-format-11
        LIBFFI=libffi7
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-12)
+       DEB_DEPENDS += virtualenv
+       DEB_DEPENDS += clang-14 clang-format-14
+       # for extras/scripts/checkstyle.sh
+       export CLANG_FORMAT_VER=14
+       LIBFFI=libffi8
 else
        DEB_DEPENDS += clang-11 clang-format-11
        LIBFFI=libffi7
@@ -448,10 +454,16 @@ endef
 
 .PHONY: test
 test:
+ifeq ($(CC),cc)
+       $(eval CC=clang)
+endif
        $(call test,vpp,test)
 
 .PHONY: test-debug
 test-debug:
+ifeq ($(CC),cc)
+       $(eval CC=clang)
+endif
        $(call test,vpp_debug,test)
 
 .PHONY: test-cov