Skip to content

Silence support failures in all.sh #10493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
+7 −9
Open

Silence support failures in all.sh #10493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93d150f
Hide spurious error message if uncrustify is not present
gilles-peskine-arm Nov 13, 2023
64066d7
Update comment in support_test_aesni
gilles-peskine-arm Nov 3, 2025
339a122
Suppress expected output from commands when support_xxx is false
gilles-peskine-arm Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/scripts/components-basic-checks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ component_check_code_style () {
}

support_check_code_style () {
case $(uncrustify --version) in
case $(uncrustify --version 2>/dev/null) in
*0.75.1*) true;;
*) false;;
esac
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/components-configuration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ support_build_baremetal () {
# 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
# 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 () {
Expand Down
12 changes: 5 additions & 7 deletions tests/scripts/components-platform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,11 @@ support_test_aesni () {
#
# The name of this function is possibly slightly misleading, but needs to align
# with the name of the corresponding test, component_test_aesni.
#
# In principle 32-bit x86 can support AESNI, but our implementation does not
# support 32-bit x86, so we check for x86-64.
# We can only grep /proc/cpuinfo on Linux, so this also checks for Linux
# We check only for 64-bit x86 here: 32-bit AESNI is tested separately
# in component_test_aesni_m32.
(gcc -v 2>&1 | grep Target | grep -q x86_64) &&
[[ "$HOSTTYPE" == "x86_64" && "$OSTYPE" == "linux-gnu" ]] &&
(lscpu | grep -qw aes)
[[ "$HOSTTYPE" == "x86_64" && "$OSTYPE" == "linux-gnu" ]] &&
(lscpu | grep -qw aes) 2>/dev/null
}

component_test_aesni () { # ~ 60s
Expand Down Expand Up @@ -157,7 +155,7 @@ component_test_aesni () { # ~ 60s
}

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
Expand Down