yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 02:15:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change the cpp test to be optional

Browse Source 
Remove unnecessary defines from the test.
Test by defining TEST_CPP using makefiles or cmake.
This commit is contained in:
Andrzej Kurek 2018-03-15 05:16:24 -04:00
parent 40741f8ce5
commit 0211c32c9a
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
if(TEST_CPP)
project("mbed TLS" C CXX) project("mbed TLS" C CXX)
else()
project("mbed TLS" C)
endif()
option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF) option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF)
option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF) option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)

5
programs/Makefile
View File

@ -70,7 +70,6 @@ APPS = aes/aescrypt2$(EXEXT) aes/crypt_and_hash$(EXEXT) \
test/ssl_cert_test$(EXEXT) test/benchmark$(EXEXT) \ test/ssl_cert_test$(EXEXT) test/benchmark$(EXEXT) \
test/selftest$(EXEXT) test/udp_proxy$(EXEXT) \ test/selftest$(EXEXT) test/udp_proxy$(EXEXT) \
test/zeroize$(EXEXT) \ test/zeroize$(EXEXT) \
test/header_test$(EXEXT) \
util/pem2der$(EXEXT) util/strerror$(EXEXT) \ util/pem2der$(EXEXT) util/strerror$(EXEXT) \
x509/cert_app$(EXEXT) x509/crl_app$(EXEXT) \ x509/cert_app$(EXEXT) x509/crl_app$(EXEXT) \
x509/cert_req$(EXEXT) x509/cert_write$(EXEXT) \ x509/cert_req$(EXEXT) x509/cert_write$(EXEXT) \
@ -80,6 +79,10 @@ ifdef PTHREAD
APPS += ssl/ssl_pthread_server$(EXEXT) APPS += ssl/ssl_pthread_server$(EXEXT)
endif endif
ifdef TEST_CPP
APPS += test/header_test$(EXEXT)
endif
.SILENT: .SILENT:
.PHONY: all clean list .PHONY: all clean list

2
programs/test/CMakeLists.txt
View File

@ -16,8 +16,10 @@ target_link_libraries(selftest ${libs})
add_executable(benchmark benchmark.c) add_executable(benchmark benchmark.c)
target_link_libraries(benchmark ${libs}) target_link_libraries(benchmark ${libs})
if(TEST_CPP)
add_executable(header_test header_test.cpp) add_executable(header_test header_test.cpp)
target_link_libraries(header_test ${libs}) target_link_libraries(header_test ${libs})
endif()
add_executable(ssl_cert_test ssl_cert_test.c) add_executable(ssl_cert_test ssl_cert_test.c)
target_link_libraries(ssl_cert_test ${libs}) target_link_libraries(ssl_cert_test ${libs})

8
programs/test/header_test.cpp
View File

@ -102,14 +102,6 @@
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#else
#include <stdio.h>
#include <stdlib.h>
#define mbedtls_printf printf
#define mbedtls_snprintf snprintf
#define mbedtls_exit exit
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
#endif #endif
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)