diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2022-05-10 09:09:02 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2022-05-10 09:09:02 -0400 |
| commit | a13366b26a0a35f8cffb61d8601bba2432dba4a0 (patch) | |
| tree | e5e16a27cec92df242ac6792924a692a6f47cd13 /TestScripts/cryptest.sh | |
| parent | 4bf6ba31c01c6437d50856c4c9459aa1a0dd211b (diff) | |
| download | cryptopp-git-a13366b26a0a35f8cffb61d8601bba2432dba4a0.tar.gz | |
Update cryptest.sh script
Diffstat (limited to 'TestScripts/cryptest.sh')
| -rwxr-xr-x | TestScripts/cryptest.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh index 6bcb2f62..a445574a 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -312,8 +312,10 @@ CXX_VERSION=$("${CXX}" -v 2>&1) CXX_GCC_VERSION=$("${CXX}" --version 2>&1 | head -n 1 | ${GREP} -i -E '^(gcc|g++)' | ${AWK} '{print $(NF)}') GCC_4_8=$(echo "${CXX_GCC_VERSION}" | "${GREP}" -i -c -E '^4\.8' <<< "${CXX_GCC_VERSION}") GCC_4_8_OR_ABOVE=$(echo "${CXX_GCC_VERSION}" | "${GREP}" -i -c -E '^(4\.[8-9]|[5-9]\.|[1-9][0-9]\.)') +GCC_10_0_OR_ABOVE=$(echo "${CXX_GCC_VERSION}" | "${GREP}" -i -c -E '^(1[0-9]\.|[2-9][0-9]\.)') GCC_11_0_OR_ABOVE=$(echo "${CXX_GCC_VERSION}" | "${GREP}" -i -c -E '^(1[1-9]\.|[2-9][0-9]\.)') GCC_12_0_OR_ABOVE=$(echo "${CXX_GCC_VERSION}" | "${GREP}" -i -c -E '^(1[2-9]\.|[2-9][0-9]\.)') +GCC_12_0_OR_BELOW=$(echo "${CXX_GCC_VERSION}" | "${GREP}" -i -c -E '^([0-9]\.|1[0-2]\.)') CXX_SUNCC_VERSION=$("${CXX}" -V 2>&1 | head -n 1 | ${GREP} -i -E '^CC: (Sun|Studio)' | ${AWK} '{print $(NF)}') SUNCC_5_10_OR_ABOVE=$(echo "${CXX_SUNCC_VERSION}" | "${GREP}" -c -E "^(5\.1[0-9]|5\.[2-9]|[6-9]\.)") @@ -324,8 +326,8 @@ if [[ ("$SUNCC_5_10_OR_ABOVE" -ne 0) ]]; then fi # Fixup, Analyzer available in GCC 10.0, but C++ is not planned until GCC 11. -# GCC 11.0 is still missing analyzer support for C++. -if [[ ("$GCC_COMPILER" -ne 0) && ("$GCC_12_0_OR_ABOVE" -ne 0) ]]; then +# GCC 12.0 is still missing analyzer support for C++. +if [[ ("$GCC_COMPILER" -ne 0) && ("$GCC_12_0_OR_BELOW" -ne 0) ]]; then HAVE_ANALYZER=0 fi |