Merge remote-tracking branch 'origin/development' into development-restricted
* origin/development: (33 commits) Test with MBEDTLS_ECP_RESTARTABLE Allow TODO in code Use the docstring in the command line help Split _abi_compliance_command into smaller functions Record the commits that were compared Document how to build the typical argument for -s Allow running /somewhere/else/path/to/abi_check.py Warn if VLAs are used Remove redundant compiler flag Consistently spell -Wextra Update Mbed Crypto to contain mbed-crypto#152 Improve compatibility with firewalled networks Dockerfile: apt -> apt-get Change Docker container to bionic Clean up file prologue comments Add docker-based test scripts ChangeLog: Add ChangeLog entry for #2681 Allow declarations after statements CMake: Add a subdirectory build regression test README: Enable builds as a CMake subproject ...
This commit is contained in:
commit
c510b1ab29
24 changed files with 923 additions and 204 deletions
|
@ -242,6 +242,11 @@ cleanup()
|
|||
git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile
|
||||
cd ..
|
||||
|
||||
# Remove any artifacts from the component_test_cmake_as_subdirectory test.
|
||||
rm -rf programs/test/cmake_subproject/build
|
||||
rm -f programs/test/cmake_subproject/Makefile
|
||||
rm -f programs/test/cmake_subproject/cmake_subproject
|
||||
|
||||
if [ -f "$CONFIG_BAK" ]; then
|
||||
mv "$CONFIG_BAK" "$CONFIG_H"
|
||||
fi
|
||||
|
@ -836,7 +841,7 @@ component_test_no_use_psa_crypto_full_cmake_asan() {
|
|||
msg "build: cmake, full config + 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_ECP_RESTARTABLE # restartable ECC not supported through PSA
|
||||
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_USE_PSA_CRYPTO
|
||||
scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C
|
||||
|
@ -1236,6 +1241,19 @@ component_test_cmake_out_of_source () {
|
|||
unset MBEDTLS_ROOT_DIR
|
||||
}
|
||||
|
||||
component_test_cmake_as_subdirectory () {
|
||||
msg "build: cmake 'as-subdirectory' build"
|
||||
MBEDTLS_ROOT_DIR="$PWD"
|
||||
|
||||
cd programs/test/cmake_subproject
|
||||
cmake .
|
||||
make
|
||||
if_build_succeeded ./cmake_subproject
|
||||
|
||||
cd "$MBEDTLS_ROOT_DIR"
|
||||
unset MBEDTLS_ROOT_DIR
|
||||
}
|
||||
|
||||
component_test_zeroize () {
|
||||
# Test that the function mbedtls_platform_zeroize() is not optimized away by
|
||||
# different combinations of compilers and optimization flags by using an
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue