ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6749 from AndrzejKurek/feature-mbedtls-platform-setup 

Add platform setup and teardown calls to mbedtls tests
pull/6336/head
Cruz Monrreal 2018-05-17 10:08:44 -05:00 committed by GitHub
parent 54ac02b080 29515c589b
commit 77f5c4ac04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
TESTS/mbedtls/multi/main.cpp
View File

@ -23,6 +23,12 @@
#include "mbedtls/sha256.h" #include "mbedtls/sha256.h"
#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdio.h>
#define mbedtls_printf printf
#endif
using namespace utest::v1; using namespace utest::v1;
@ -163,5 +169,18 @@ utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler); Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
int main() { int main() {
Harness::run(specification); int ret = 0;
#if defined(MBEDTLS_PLATFORM_C)
mbedtls_platform_context platform_ctx;
if((ret = mbedtls_platform_setup(&platform_ctx))!= 0)
{
mbedtls_printf("Mbed TLS multitest failed! mbedtls_platform_setup returned %d\n", ret);
return 1;
}
#endif
ret = (Harness::run(specification) ? 0 : 1);
#if defined(MBEDTLS_PLATFORM_C)
mbedtls_platform_teardown(&platform_ctx);
#endif
return ret;
} }

20
TESTS/mbedtls/selftest/main.cpp
View File

@ -39,12 +39,7 @@ using namespace utest::v1;
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#else #else
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#define mbedtls_printf printf #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
#define MBEDTLS_SELF_TEST_TEST_CASE(self_test_function) \ #define MBEDTLS_SELF_TEST_TEST_CASE(self_test_function) \
@ -97,6 +92,19 @@ utest::v1::status_t test_setup(const size_t num_cases) {
Specification specification(test_setup, cases); Specification specification(test_setup, cases);
int main() { int main() {
return !Harness::run(specification); int ret = 0;
#if defined(MBEDTLS_PLATFORM_C)
mbedtls_platform_context platform_ctx;
if((ret = mbedtls_platform_setup(&platform_ctx))!= 0)
{
mbedtls_printf("Mbed TLS selftest failed! mbedtls_platform_setup returned %d\n", ret);
return 1;
}
#endif
ret = (Harness::run(specification) ? 0 : 1);
#if defined(MBEDTLS_PLATFORM_C)
mbedtls_platform_teardown(&platform_ctx);
#endif
return ret;
} }