commit 0211c32c9af554a816401efa14064f058bd5aeb1
author Andrzej Kurek <andrzej.kurek@arm.com> Thu Mar 15 05:16:24 2018 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Thu Jun 28 05:07:08 2018 -0400
tree bcecd10d957e88d6aaef0d35c20fe8b85bfea76c
parent 40741f8ce5841c507155bf7954b08ffdcb64100a

Change the cpp test to be optional

Remove unnecessary defines from the test.
Test by defining TEST_CPP using makefiles or cmake.

programs/test/CMakeLists.txt

diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt
index 32c1415..6791ffd 100644
--- a/programs/test/CMakeLists.txt
+++ b/programs/test/CMakeLists.txt
@@ -16,9 +16,11 @@
 add_executable(benchmark benchmark.c)
 target_link_libraries(benchmark ${libs})
 
-add_executable(header_test header_test.cpp)
-target_link_libraries(header_test ${libs})
-    
+if(TEST_CPP)
+	add_executable(header_test header_test.cpp)
+	target_link_libraries(header_test ${libs})
+endif()
+
 add_executable(ssl_cert_test ssl_cert_test.c)
 target_link_libraries(ssl_cert_test ${libs})
 

programs/test/header_test.cpp

diff --git a/programs/test/header_test.cpp b/programs/test/header_test.cpp
index d1ddd4b..69d7c4a 100644
--- a/programs/test/header_test.cpp
+++ b/programs/test/header_test.cpp
@@ -102,14 +102,6 @@
 
 #if defined(MBEDTLS_PLATFORM_C)
 #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
 
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)