Skip to content

Commit 1938faa

Browse files
author
Andrzej Kurek
committed
Add platform setup and teardown calls to mbedtls tests
1 parent 675528b commit 1938faa

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

TESTS/mbedtls/multi/main.cpp

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323

2424
#include "mbedtls/sha256.h"
2525

26+
#if defined(MBEDTLS_PLATFORM_C)
27+
#include "mbedtls/platform.h"
28+
#else
29+
#include <stdio.h>
30+
#include <stdlib.h>
31+
#define mbedtls_printf printf
32+
#define mbedtls_snprintf snprintf
33+
#define mbedtls_exit exit
34+
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
35+
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
36+
#endif
2637

2738
using namespace utest::v1;
2839

@@ -163,5 +174,18 @@ utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
163174
Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
164175

165176
int main() {
166-
Harness::run(specification);
177+
int ret = 0;
178+
#if defined(MBEDTLS_PLATFORM_C)
179+
mbedtls_platform_context platform_ctx;
180+
if((ret = mbedtls_platform_setup(&platform_ctx))!= 0)
181+
{
182+
mbedtls_printf("Mbed TLS selftest failed! mbedtls_platform_setup returned %d\n", ret);
183+
return 1;
184+
}
185+
#endif
186+
ret = (Harness::run(specification) ? 0 : 1);
187+
#if defined(MBEDTLS_PLATFORM_C)
188+
mbedtls_platform_teardown(&platform_ctx);
189+
#endif
190+
return ret;
167191
}

TESTS/mbedtls/selftest/main.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,19 @@ utest::v1::status_t test_setup(const size_t num_cases) {
9797
Specification specification(test_setup, cases);
9898

9999
int main() {
100-
return !Harness::run(specification);
100+
int ret = 0;
101+
#if defined(MBEDTLS_PLATFORM_C)
102+
mbedtls_platform_context platform_ctx;
103+
if((ret = mbedtls_platform_setup(&platform_ctx))!= 0)
104+
{
105+
mbedtls_printf("Mbed TLS selftest failed! mbedtls_platform_setup returned %d\n", ret);
106+
return 1;
107+
}
108+
#endif
109+
ret = (Harness::run(specification) ? 0 : 1);
110+
#if defined(MBEDTLS_PLATFORM_C)
111+
mbedtls_platform_teardown(&platform_ctx);
112+
#endif
113+
return ret;
101114
}
102115

0 commit comments

Comments
 (0)