mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-30 22:43:08 +03:00
Move quiet wrapper setup
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
@ -124,25 +124,6 @@ pre_check_environment () {
|
||||
}
|
||||
|
||||
pre_initialize_variables () {
|
||||
special_options="--list-components|--list-all-components|-h|--help"
|
||||
if [[ ! "$@" =~ $special_options ]]; then
|
||||
# skip wrappers for "special options" which don't actually run any tests
|
||||
|
||||
# Pick up "quiet" wrappers for make and cmake, which don't output very much
|
||||
# unless there is an error. This reduces logging overhead in the CI.
|
||||
#
|
||||
# Note that the cmake wrapper breaks unless we use an absolute path here.
|
||||
export PATH=${PWD}/tests/scripts/quiet:$PATH
|
||||
if [[ ! -x ${PWD}/tests/scripts/quiet/make ]]; then
|
||||
echo "can't find quiet/make"
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -x ${PWD}/tests/scripts/quiet/cmake ]]; then
|
||||
echo "can't find quiet/cmake"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
CONFIG_H='include/mbedtls/config.h'
|
||||
CRYPTO_CONFIG_H='include/psa/crypto_config.h'
|
||||
|
||||
@ -218,6 +199,23 @@ pre_initialize_variables () {
|
||||
# the commands set by the environment
|
||||
}
|
||||
|
||||
setup_quiet_wrappers()
|
||||
{
|
||||
# Pick up "quiet" wrappers for make and cmake, which don't output very much
|
||||
# unless there is an error. This reduces logging overhead in the CI.
|
||||
#
|
||||
# Note that the cmake wrapper breaks unless we use an absolute path here.
|
||||
export PATH=${PWD}/tests/scripts/quiet:$PATH
|
||||
if [[ ! -x ${PWD}/tests/scripts/quiet/make ]]; then
|
||||
echo "can't find quiet/make"
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -x ${PWD}/tests/scripts/quiet/cmake ]]; then
|
||||
echo "can't find quiet/cmake"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test whether the component $1 is included in the command line patterns.
|
||||
is_component_included()
|
||||
{
|
||||
@ -3752,6 +3750,7 @@ pre_check_environment
|
||||
pre_initialize_variables "$@"
|
||||
pre_parse_command_line "$@"
|
||||
|
||||
setup_quiet_wrappers
|
||||
pre_check_git
|
||||
pre_restore_files
|
||||
pre_back_up
|
||||
|
Reference in New Issue
Block a user