mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-25 09:02:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make no_deprecated naming more consistent

Browse Source 
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 <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2020-04-20 21:39:22 +02:00
parent c34faba8fc
commit 30de2e84ef
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/config.py
View File

@ -302,10 +302,10 @@ DEPRECATED = frozenset([
'MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO', 'MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO',
]) ])
def non_deprecated_adapter(adapter): def no_deprecated_adapter(adapter):
"""Modify an adapter to disable deprecated symbols. """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 ``adapter(name, active, section)``, but unsets all deprecated symbols
and sets ``MBEDTLS_DEPRECATED_REMOVED``. and sets ``MBEDTLS_DEPRECATED_REMOVED``.
""" """
@ -480,7 +480,7 @@ if __name__ == '__main__':
Exclude alternative implementations and platform support Exclude alternative implementations and platform support
options, as well as some options that are awkward to test. 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. """Uncomment most non-deprecated features.
Like "full", but without deprecated features. Like "full", but without deprecated features.
""") """)

14
tests/scripts/all.sh
View File

@ -907,22 +907,22 @@ component_test_default_no_deprecated () {
} }
component_test_full_no_deprecated () { component_test_full_no_deprecated () {
msg "build: make, full_non_deprecated config" # ~ 30s msg "build: make, full_no_deprecated config" # ~ 30s
scripts/config.py full_non_deprecated scripts/config.py full_no_deprecated
make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' 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 make test
} }
component_test_no_deprecated_warning () { component_test_full_no_deprecated_warning () {
msg "build: make, full_non_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 30s msg "build: make, full_no_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 30s
scripts/config.py full_non_deprecated scripts/config.py full_no_deprecated
scripts/config.py unset MBEDTLS_DEPRECATED_REMOVED scripts/config.py unset MBEDTLS_DEPRECATED_REMOVED
scripts/config.py set MBEDTLS_DEPRECATED_WARNING scripts/config.py set MBEDTLS_DEPRECATED_WARNING
make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' 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 make test
} }