all_sh: add a check for header inclusion in cpp_dummy_build.cpp

change the g++ test to be incremental, to save time
reorganize header order in cpp_dummy_build.cpp according to c locale
This commit is contained in:
Andrzej Kurek 2018-07-02 09:08:21 -04:00
parent 05be06cc2d
commit 991f9fefd9
2 changed files with 20 additions and 9 deletions

View File

@ -41,6 +41,7 @@
#include "mbedtls/certs.h" #include "mbedtls/certs.h"
#include "mbedtls/chacha20.h" #include "mbedtls/chacha20.h"
#include "mbedtls/chachapoly.h" #include "mbedtls/chachapoly.h"
#include "mbedtls/check_config.h"
#include "mbedtls/cipher.h" #include "mbedtls/cipher.h"
#include "mbedtls/cipher_internal.h" #include "mbedtls/cipher_internal.h"
#include "mbedtls/cmac.h" #include "mbedtls/cmac.h"
@ -61,21 +62,21 @@
#include "mbedtls/havege.h" #include "mbedtls/havege.h"
#include "mbedtls/hkdf.h" #include "mbedtls/hkdf.h"
#include "mbedtls/hmac_drbg.h" #include "mbedtls/hmac_drbg.h"
#include "mbedtls/md.h"
#include "mbedtls/md2.h" #include "mbedtls/md2.h"
#include "mbedtls/md4.h" #include "mbedtls/md4.h"
#include "mbedtls/md5.h" #include "mbedtls/md5.h"
#include "mbedtls/md.h"
#include "mbedtls/md_internal.h" #include "mbedtls/md_internal.h"
#include "mbedtls/net.h" #include "mbedtls/net.h"
#include "mbedtls/net_sockets.h" #include "mbedtls/net_sockets.h"
#include "mbedtls/oid.h" #include "mbedtls/oid.h"
#include "mbedtls/padlock.h" #include "mbedtls/padlock.h"
#include "mbedtls/pem.h" #include "mbedtls/pem.h"
#include "mbedtls/pk.h"
#include "mbedtls/pk_internal.h"
#include "mbedtls/pkcs11.h" #include "mbedtls/pkcs11.h"
#include "mbedtls/pkcs12.h" #include "mbedtls/pkcs12.h"
#include "mbedtls/pkcs5.h" #include "mbedtls/pkcs5.h"
#include "mbedtls/pk.h"
#include "mbedtls/pk_internal.h"
#include "mbedtls/platform_time.h" #include "mbedtls/platform_time.h"
#include "mbedtls/platform_util.h" #include "mbedtls/platform_util.h"
#include "mbedtls/poly1305.h" #include "mbedtls/poly1305.h"
@ -85,19 +86,19 @@
#include "mbedtls/sha1.h" #include "mbedtls/sha1.h"
#include "mbedtls/sha256.h" #include "mbedtls/sha256.h"
#include "mbedtls/sha512.h" #include "mbedtls/sha512.h"
#include "mbedtls/ssl.h"
#include "mbedtls/ssl_cache.h" #include "mbedtls/ssl_cache.h"
#include "mbedtls/ssl_ciphersuites.h" #include "mbedtls/ssl_ciphersuites.h"
#include "mbedtls/ssl_cookie.h" #include "mbedtls/ssl_cookie.h"
#include "mbedtls/ssl.h"
#include "mbedtls/ssl_internal.h" #include "mbedtls/ssl_internal.h"
#include "mbedtls/ssl_ticket.h" #include "mbedtls/ssl_ticket.h"
#include "mbedtls/threading.h" #include "mbedtls/threading.h"
#include "mbedtls/timing.h" #include "mbedtls/timing.h"
#include "mbedtls/version.h" #include "mbedtls/version.h"
#include "mbedtls/x509.h"
#include "mbedtls/x509_crl.h" #include "mbedtls/x509_crl.h"
#include "mbedtls/x509_crt.h" #include "mbedtls/x509_crt.h"
#include "mbedtls/x509_csr.h" #include "mbedtls/x509_csr.h"
#include "mbedtls/x509.h"
#include "mbedtls/xtea.h" #include "mbedtls/xtea.h"
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)

View File

@ -228,6 +228,14 @@ check_tools()
done done
} }
check_headers_in_cpp () {
ls include/mbedtls >headers.txt
<programs/test/cpp_dummy_build.cpp sed -n 's/"$//; s!^#include "mbedtls/!!p' |
sort |
diff headers.txt -
rm headers.txt
}
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
--armcc) RUN_ARMCC=1;; --armcc) RUN_ARMCC=1;;
@ -581,14 +589,16 @@ msg "test/build: key-exchanges (gcc)" # ~ 1 min
cleanup cleanup
record_status tests/scripts/key-exchanges.pl record_status tests/scripts/key-exchanges.pl
msg "build: Unix make, gcc and g++ test" # ~ 30s
cleanup
make TEST_CPP=1
msg "build: Unix make, -Os (gcc)" # ~ 30s msg "build: Unix make, -Os (gcc)" # ~ 30s
cleanup cleanup
make CC=gcc CFLAGS='-Werror -Wall -Wextra -Os' make CC=gcc CFLAGS='-Werror -Wall -Wextra -Os'
msg "test: verify header list in cpp_dummy_build.cpp"
record_status check_headers_in_cpp
msg "build: Unix make, incremental g++"
make TEST_CPP=1
# Full configuration build, without platform support, file IO and net sockets. # Full configuration build, without platform support, file IO and net sockets.
# This should catch missing mbedtls_printf definitions, and by disabling file # This should catch missing mbedtls_printf definitions, and by disabling file
# IO, it should catch missing '#include <stdio.h>' # IO, it should catch missing '#include <stdio.h>'