Skip to content

Commit 55979dc

Browse files
authored
Fix clang-format version check (#1241)
1 parent 9f9cc32 commit 55979dc

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

scripts/clang-format-test.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,17 @@ done
3737
echo "Using clang-format ${CLANG_FORMAT_EXE} with arguments ${CLANG_FORMAT_ARG}."
3838

3939
clang_format_version="$(${CLANG_FORMAT_EXE} --version)"
40-
currentver="$(${CLANG_FORMAT_EXE} --version | cut -d' ' -f3 | tr -dc '0-9')"
41-
if [ $currentver -lt 1200 ]; then
40+
currentver="$( ${CLANG_FORMAT_EXE} --version | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | sed 's/\.//g')"
41+
if [ "${currentver:=0}" -lt 1200 ]; then
4242
echo "clang-format version is $clang_format_version. We require version 12."
4343
exit 1
4444
fi
4545

46-
if [ $currentver -ge 1300 ]; then
46+
if [ "${currentver:=0}" -ge 1300 ]; then
4747
echo "clang-format version is $clang_format_version. We require version 12."
4848
exit 1
4949
fi
5050

51-
5251
# Setup SST-Core Directories to be skipped for clang-format checks
5352
DIRS_TO_SKIP="-path ./build "
5453
DIRS_TO_SKIP="$DIRS_TO_SKIP -or -path ./src/sst/core/libltdl"

0 commit comments

Comments
 (0)