From 30de2e84ef9c11564d64c54d6594fdccbe805355 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 20 Apr 2020 21:39:22 +0200 Subject: [PATCH] Make no_deprecated naming more consistent Use "no_deprecated" both in the name of the configuration and in the name of all.sh components, rather than a mixture of "no_deprecated" and "non_deprecated". Make all.sh component names more consistent. Signed-off-by: Gilles Peskine --- scripts/config.py | 6 +++--- tests/scripts/all.sh | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/config.py b/scripts/config.py index 8f69f9fb0..63d052ba6 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -302,10 +302,10 @@ DEPRECATED = frozenset([ 'MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO', ]) -def non_deprecated_adapter(adapter): +def no_deprecated_adapter(adapter): """Modify an adapter to disable deprecated symbols. - ``non_deprecated_adapter(adapter)(name, active, section)`` is like + ``no_deprecated_adapter(adapter)(name, active, section)`` is like ``adapter(name, active, section)``, but unsets all deprecated symbols and sets ``MBEDTLS_DEPRECATED_REMOVED``. """ @@ -480,7 +480,7 @@ if __name__ == '__main__': Exclude alternative implementations and platform support options, as well as some options that are awkward to test. """) - add_adapter('full_non_deprecated', non_deprecated_adapter(full_adapter), + add_adapter('full_no_deprecated', no_deprecated_adapter(full_adapter), """Uncomment most non-deprecated features. Like "full", but without deprecated features. """) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 83d2d1bfe..4a142c7df 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -907,22 +907,22 @@ component_test_default_no_deprecated () { } component_test_full_no_deprecated () { - msg "build: make, full_non_deprecated config" # ~ 30s - scripts/config.py full_non_deprecated + msg "build: make, full_no_deprecated config" # ~ 30s + scripts/config.py full_no_deprecated make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' - msg "test: make, full_non_deprecated config" # ~ 5s + msg "test: make, full_no_deprecated config" # ~ 5s make test } -component_test_no_deprecated_warning () { - msg "build: make, full_non_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 30s - scripts/config.py full_non_deprecated +component_test_full_no_deprecated_warning () { + msg "build: make, full_no_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 30s + scripts/config.py full_no_deprecated scripts/config.py unset MBEDTLS_DEPRECATED_REMOVED scripts/config.py set MBEDTLS_DEPRECATED_WARNING make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' - msg "test: make, full_non_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 5s + msg "test: make, full_no_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 5s make test }