diff options
| author | Jaeden Amero <jaeden.amero@arm.com> | 2019-09-05 14:23:55 +0100 |
|---|---|---|
| committer | Jaeden Amero <jaeden.amero@arm.com> | 2019-09-05 14:23:55 +0100 |
| commit | ba7f4d1484c0e7eb11a4b3aec8998cff00b3eea3 (patch) | |
| tree | cbbfe2f68363945392e2a2ad463519a637d2cdea | |
| parent | 8dd6bc7ac418a6223dc43e794af30dc6762b7bbb (diff) | |
| parent | dc3a179995f0ae32c944c1d913e4b25f176dd72b (diff) | |
| download | mbedtls-ba7f4d1484c0e7eb11a4b3aec8998cff00b3eea3.zip mbedtls-ba7f4d1484c0e7eb11a4b3aec8998cff00b3eea3.tar.gz mbedtls-ba7f4d1484c0e7eb11a4b3aec8998cff00b3eea3.tar.bz2 | |
Merge remote-tracking branch 'origin/pr/2771' into development
* origin/pr/2771:
Fix copypasta in msg
When not using PSA crypto, disable it
Disable MEMORY_BUFFER_ALLOC with ASan
Remove config.pl calls with no effect
| -rwxr-xr-x | tests/scripts/all.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index abfef49..13c5c2d 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -840,11 +840,11 @@ component_build_default_make_gcc_and_cxx () { component_test_no_use_psa_crypto_full_cmake_asan() { # full minus MBEDTLS_USE_PSA_CRYPTO: run the same set of tests as basic-build-test.sh - msg "build: cmake, full config + MBEDTLS_USE_PSA_CRYPTO, ASan" + msg "build: cmake, full config minus MBEDTLS_USE_PSA_CRYPTO, ASan" scripts/config.pl full - scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests + scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # slow and makes ASan mostly ineffective scripts/config.pl set MBEDTLS_ECP_RESTARTABLE # not using PSA, so enable restartable ECC - scripts/config.pl set MBEDTLS_PSA_CRYPTO_C + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_C scripts/config.pl unset MBEDTLS_USE_PSA_CRYPTO scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C @@ -885,7 +885,6 @@ component_test_check_params_without_platform () { msg "build+test: MBEDTLS_CHECK_PARAMS without MBEDTLS_PLATFORM_C" scripts/config.pl full # includes CHECK_PARAMS # Keep MBEDTLS_PARAM_FAILED as assert. - scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C scripts/config.pl unset MBEDTLS_PLATFORM_EXIT_ALT scripts/config.pl unset MBEDTLS_PLATFORM_TIME_ALT @@ -1074,6 +1073,7 @@ component_test_m32_o0 () { # Build once with -O0, to compile out the i386 specific inline assembly msg "build: i386, make, gcc -O0 (ASan build)" # ~ 30s scripts/config.pl full + scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # slow and makes ASan mostly ineffective make CC=gcc CFLAGS='-O0 -Werror -Wall -Wextra -m32 -fsanitize=address' LDFLAGS='-m32 -fsanitize=address' msg "test: i386, make, gcc -O0 (ASan build)" @@ -1090,9 +1090,7 @@ component_test_m32_o1 () { # Build again with -O1, to compile in the i386 specific inline assembly msg "build: i386, make, gcc -O1 (ASan build)" # ~ 30s scripts/config.pl full - scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE - scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C - scripts/config.pl unset MBEDTLS_MEMORY_DEBUG + scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # slow and makes ASan mostly ineffective make CC=gcc CFLAGS='-O1 -Werror -Wall -Wextra -m32 -fsanitize=address' LDFLAGS='-m32 -fsanitize=address' msg "test: i386, make, gcc -O1 (ASan build)" |