mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-09-27 12:37:25 +00:00
Suppress expected output from commands when support_xxx is false
Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
@@ -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 () {
|
||||
|
||||
@@ -98,7 +98,7 @@ support_test_aesni () {
|
||||
# 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)
|
||||
(lscpu | grep -qw aes) 2>/dev/null
|
||||
}
|
||||
|
||||
component_test_aesni () { # ~ 60s
|
||||
@@ -155,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
|
||||
|
||||
Reference in New Issue
Block a user