Merge pull request #10493 from gilles-peskine-arm/all.sh-silence-support-failures-4.0

Silence support failures in all.sh
This commit is contained in:
Valerio Setti 2026-08-31 14:36:46 +00:00 committed by GitHub
commit 33f79f8ab0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 9 deletions

View File

@ -174,7 +174,7 @@ component_check_code_style () {
} }
support_check_code_style () { support_check_code_style () {
case $(uncrustify --version) in case $(uncrustify --version 2>/dev/null) in
*0.75.1*) true;; *0.75.1*) true;;
*) false;; *) false;;
esac esac

View File

@ -227,7 +227,7 @@ support_build_baremetal () {
# Older Glibc versions include time.h from other headers such as stdlib.h, # Older Glibc versions include time.h from other headers such as stdlib.h,
# which makes the no-time.h-in-baremetal check fail. Ubuntu 16.04 has this # which makes the no-time.h-in-baremetal check fail. Ubuntu 16.04 has this
# problem, Ubuntu 18.04 is ok. # problem, Ubuntu 18.04 is ok.
! grep -q -F time.h /usr/include/x86_64-linux-gnu/sys/types.h ! grep -s -q -F time.h /usr/include/x86_64-linux-gnu/sys/types.h
} }
component_build_tfm () { component_build_tfm () {

View File

@ -94,13 +94,11 @@ support_test_aesni () {
# #
# The name of this function is possibly slightly misleading, but needs to align # The name of this function is possibly slightly misleading, but needs to align
# with the name of the corresponding test, component_test_aesni. # with the name of the corresponding test, component_test_aesni.
# # We check only for 64-bit x86 here: 32-bit AESNI is tested separately
# In principle 32-bit x86 can support AESNI, but our implementation does not # in component_test_aesni_m32.
# support 32-bit x86, so we check for x86-64.
# We can only grep /proc/cpuinfo on Linux, so this also checks for Linux
(gcc -v 2>&1 | grep Target | grep -q x86_64) && (gcc -v 2>&1 | grep Target | grep -q x86_64) &&
[[ "$HOSTTYPE" == "x86_64" && "$OSTYPE" == "linux-gnu" ]] && [[ "$HOSTTYPE" == "x86_64" && "$OSTYPE" == "linux-gnu" ]] &&
(lscpu | grep -qw aes) (lscpu | grep -qw aes) 2>/dev/null
} }
component_test_aesni () { # ~ 60s component_test_aesni () { # ~ 60s
@ -157,7 +155,7 @@ component_test_aesni () { # ~ 60s
} }
support_test_aesni_m32 () { support_test_aesni_m32 () {
support_test_m32_no_asm && (lscpu | grep -qw aes) support_test_m32_no_asm && (lscpu | grep -qw aes) 2>/dev/null
} }
component_test_aesni_m32 () { # ~ 60s component_test_aesni_m32 () { # ~ 60s