diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2024-07-23 01:28:19 -0400 |
|---|---|---|
| committer |   Beno�t Ganne <bganne@cisco.com> | 2024-08-07 09:15:17 +0000 |
| commit | cf9356d642ce131c6562fcd281c01e51af888ec3 (patch) | |
| tree | 8a57da79b102ee9a6c4fa3d8c834591ddfdbaff0 /extras/scripts | |
| parent | 0a3b0b231d8d2978c3322cc5ba8e1d2746a6d730 (diff) | |
tests: update scapy to version 2.4.5
- Required for Ubuntu 24.04 LTS jobs
- temporarily disable TestIpsecEsp1 and
TestIpsecAhAll tests until a patch can
be added to fix them
Type: test
Change-Id: I1ae7b170117182c3252629bbbb770775e2c496c9
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'extras/scripts')
| -rwxr-xr-x | extras/scripts/checkstyle.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh index 2b884f5f08b..304beff51d0 100755 --- a/extras/scripts/checkstyle.sh +++ b/extras/scripts/checkstyle.sh @@ -19,7 +19,7 @@ CLANG_FORMAT_VER_REGEX='([0-9]+)\.[0-9]+\.[0-9]+' CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py" # TODO: Remove clang-format-${CLANG_FORMAT_VER} from 'make install-deps' when -# CLANG_FORMAT_VER default value is upgraded +# CLANG_FORMAT_VER default value is upgraded to 15 after Ubuntu-20.04 is deprecated CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-11} GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1" GIT_DIFF_EXCLUDE_LIST=( @@ -30,16 +30,20 @@ CLANG_FORMAT_DIFF_ARGS="-style file -p1" SUFFIX="-${CLANG_FORMAT_VER}" # Attempt to find clang-format to confirm Clang version. -if command -v clang-format${SUFFIX} &> /dev/null; +if command -v "clang-format${SUFFIX}" &> /dev/null; then - CLANG_FORMAT=clang-format${SUFFIX} -elif command -v clang-format &> /dev/null; -then - CLANG_FORMAT=clang-format + CLANG_FORMAT="clang-format${SUFFIX}" +else + echo "*******************************************************************" + echo "* CHECKSTYLE FAILED" + echo "* Could not locate the clang-format${SUFFIX} script" + echo "* Run 'make install-deps' to install it" + echo "*******************************************************************" + exit 1 fi CLANG_FORMAT_VERSION=$(${CLANG_FORMAT} --version) -echo $CLANG_FORMAT_VERSION +echo "$CLANG_FORMAT_VERSION" # Confirm that Clang is the expected version. if [[ ! $CLANG_FORMAT_VERSION =~ $CLANG_FORMAT_VER_REGEX ]]; @@ -75,6 +79,7 @@ then echo "*******************************************************************" echo "* CHECKSTYLE FAILED" echo "* Could not locate the clang-format-diff script" + echo "* Run 'make install-deps' to install it" echo "*******************************************************************" exit 1 fi |