diff --git a/CMakeLists.txt b/CMakeLists.txt index ffaf677c5..094d9069b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ if(ENABLE_TESTING) ADD_CUSTOM_TARGET(covtest COMMAND make test COMMAND programs/test/selftest - COMMAND tests/compat.sh -m 'tls1 tls1_1 tls1_2 dtls1 dtls1_2' + COMMAND tests/compat.sh COMMAND tests/ssl-opt.sh ) diff --git a/tests/compat.sh b/tests/compat.sh index 4b43e33a5..a333a1916 100755 --- a/tests/compat.sh +++ b/tests/compat.sh @@ -45,7 +45,7 @@ else fi # default values for options -MODES="ssl3 tls1 tls1_1 tls1_2 dtls1 dtls1_2" +MODES="tls1 tls1_1 tls1_2 dtls1 dtls1_2" VERIFIES="NO YES" TYPES="ECDSA RSA PSK" FILTER="" diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 2c63ab546..467f22a93 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1,5 +1,11 @@ #!/bin/sh +# all.sh +# +# Copyright (c) 2014-2016, ARM Limited, All Rights Reserved +# +# Purpose +# # Run all available tests (mostly). # # Warning: includes various build modes, so it will mess with the current @@ -125,6 +131,22 @@ make msg "test: compat.sh (ASan build)" # ~ 6 min tests/compat.sh +msg "build: Default + SSLv3 (ASan build)" # ~ 6 min +cleanup +scripts/config.pl set MBEDTLS_SSL_PROTO_SSL3 +CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan . +make + +msg "test: SSLv3 - main suites and selftest (ASan build)" # ~ 50s +make test +programs/test/selftest + +msg "build: SSLv3 - compat.sh (ASan build)" # ~ 6 min +tests/compat.sh -m 'ssl3 tls1 tls1_1 tls1_2 dtls1 dtls1_2' + +msg "build: SSLv3 - ssl-opt.sh (ASan build)" # ~ 6 min +tests/ssl-opt.sh + msg "build: cmake, full config, clang" # ~ 50s cleanup cp "$CONFIG_H" "$CONFIG_BAK"