From e86cdcb7bfff449ef37a11c050cc4d0db244ff50 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sat, 29 Oct 2022 17:51:19 +0200 Subject: [PATCH 1/2] Remove redundant build-only driver interface component component_build_psa_accel_alg_ecdsa is subsumed by component_test_psa_crypto_config_accel_ecdsa, which has the same configuration and additionally runs the unit tests. Signed-off-by: Gilles Peskine --- tests/scripts/all.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index a20dd921d..cfb7ffa68 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -2053,24 +2053,6 @@ component_test_psa_crypto_config_chachapoly_disabled() { make test } -# This should be renamed to test and updated once the accelerator ECDSA code is in place and ready to test. -component_build_psa_accel_alg_ecdsa() { - # full plus MBEDTLS_PSA_CRYPTO_CONFIG with PSA_WANT_ALG_ECDSA - # without MBEDTLS_ECDSA_C - # PSA_WANT_ALG_ECDSA and PSA_WANT_ALG_DETERMINISTIC_ECDSA are already - # set in include/psa/crypto_config.h - msg "build: full + MBEDTLS_PSA_CRYPTO_CONFIG + PSA_WANT_ALG_ECDSA without MBEDTLS_ECDSA_C" - scripts/config.py full - scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG - scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS - scripts/config.py unset MBEDTLS_USE_PSA_CRYPTO - scripts/config.py unset MBEDTLS_ECDSA_C - scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED - scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED - # Need to define the correct symbol and include the test driver header path in order to build with the test driver - make CC=gcc CFLAGS="$ASAN_CFLAGS -DPSA_CRYPTO_DRIVER_TEST -DMBEDTLS_PSA_ACCEL_ALG_ECDSA -DMBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA -I../tests/include -O2" LDFLAGS="$ASAN_CFLAGS" -} - # This should be renamed to test and updated once the accelerator ECDH code is in place and ready to test. component_build_psa_accel_alg_ecdh() { # full plus MBEDTLS_PSA_CRYPTO_CONFIG with PSA_WANT_ALG_ECDH From 83264bed6307971cd2e88008e1143286d3aab9e5 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sun, 30 Oct 2022 21:02:40 +0100 Subject: [PATCH 2/2] Group cpp_dummy_build test into an existing component No need to do yet another build just to compile an additional trivial program. Signed-off-by: Gilles Peskine --- tests/scripts/all.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index cfb7ffa68..21f415b15 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1533,12 +1533,15 @@ component_test_psa_collect_statuses () { component_test_full_cmake_clang () { msg "build: cmake, full config, clang" # ~ 50s scripts/config.py full - CC=clang cmake -D CMAKE_BUILD_TYPE:String=Release -D ENABLE_TESTING=On . + CC=clang CXX=clang cmake -D CMAKE_BUILD_TYPE:String=Release -D ENABLE_TESTING=On -D TEST_CPP=1 . make msg "test: main suites (full config, clang)" # ~ 5s make test + msg "test: cpp_dummy_build (full config, clang)" # ~ 1s + programs/test/cpp_dummy_build + msg "test: psa_constant_names (full config, clang)" # ~ 1s tests/scripts/test_psa_constant_names.py @@ -1756,15 +1759,6 @@ component_build_key_exchanges () { tests/scripts/key-exchanges.pl } -component_test_make_cxx () { - msg "build: Unix make, full, gcc + g++" - scripts/config.py full - make TEST_CPP=1 lib programs - - msg "test: cpp_dummy_build" - programs/test/cpp_dummy_build -} - 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 minus MBEDTLS_USE_PSA_CRYPTO, ASan"