mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 13:43:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use mbedtls_test_info accessors internally as well

Browse Source 
Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2023-10-31 16:38:56 +00:00
parent 4580d4d829
commit 5c498f355d
2 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/include/test/helpers.h
View File

@ -61,14 +61,16 @@ typedef enum {
MBEDTLS_TEST_RESULT_SKIPPED MBEDTLS_TEST_RESULT_SKIPPED
} mbedtls_test_result_t; } mbedtls_test_result_t;
#define MBEDTLS_TEST_LINE_LENGTH 76
typedef struct { typedef struct {
mbedtls_test_result_t result; mbedtls_test_result_t result;
const char *test; const char *test;
const char *filename; const char *filename;
int line_no; int line_no;
unsigned long step; unsigned long step;
char line1[76]; char line1[MBEDTLS_TEST_LINE_LENGTH];
char line2[76]; char line2[MBEDTLS_TEST_LINE_LENGTH];
#if defined(MBEDTLS_TEST_MUTEX_USAGE) #if defined(MBEDTLS_TEST_MUTEX_USAGE)
const char *mutex_usage_error; const char *mutex_usage_error;
#endif #endif

94
tests/src/helpers.c
View File

@ -30,6 +30,15 @@ mbedtls_test_result_t mbedtls_test_get_result(void)
return mbedtls_test_info.result; return mbedtls_test_info.result;
} }
void mbedtls_test_set_result(mbedtls_test_result_t result, const char *test,
int line_no, const char *filename)
{
mbedtls_test_info.result = result;
mbedtls_test_info.test = test;
mbedtls_test_info.line_no = line_no;
mbedtls_test_info.filename = filename;
}
const char *mbedtls_test_get_test(void) const char *mbedtls_test_get_test(void)
{ {
return mbedtls_test_info.test; return mbedtls_test_info.test;
@ -54,15 +63,38 @@ unsigned long mbedtls_test_get_step(void)
return mbedtls_test_info.step; return mbedtls_test_info.step;
} }
void mbedtls_test_set_step(unsigned long step) {
mbedtls_test_info.step = step;
}
const char *mbedtls_test_get_line1(void) const char *mbedtls_test_get_line1(void)
{ {
return mbedtls_test_info.line1; return mbedtls_test_info.line1;
} }
void mbedtls_test_set_line1(const char *line)
{
if (line == NULL) {
memset(mbedtls_test_info.line1, 0, sizeof(mbedtls_test_info.line1));
} else {
strncpy(mbedtls_test_info.line1, line, sizeof(mbedtls_test_info.line1));
}
}
const char *mbedtls_test_get_line2(void) const char *mbedtls_test_get_line2(void)
{ {
return mbedtls_test_info.line2; return mbedtls_test_info.line2;
} }
void mbedtls_test_set_line2(const char *line) {
if (line == NULL) {
memset(mbedtls_test_info.line2, 0, sizeof(mbedtls_test_info.line2));
} else {
strncpy(mbedtls_test_info.line2, line, sizeof(mbedtls_test_info.line2));
}
}
#if defined(MBEDTLS_TEST_MUTEX_USAGE) #if defined(MBEDTLS_TEST_MUTEX_USAGE)
const char *mbedtls_test_get_mutex_usage_error(void) const char *mbedtls_test_get_mutex_usage_error(void)
{ {
@ -126,28 +158,17 @@ int mbedtls_test_ascii2uc(const char c, unsigned char *uc)
void mbedtls_test_fail(const char *test, int line_no, const char *filename) void mbedtls_test_fail(const char *test, int line_no, const char *filename)
{ {
if (mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED) { if (mbedtls_test_get_result() == MBEDTLS_TEST_RESULT_FAILED) {
/* We've already recorded the test as having failed. Don't /* We've already recorded the test as having failed. Don't
* overwrite any previous information about the failure. */ * overwrite any previous information about the failure. */
return; return;
} }
mbedtls_test_info.result = MBEDTLS_TEST_RESULT_FAILED; mbedtls_test_set_result(MBEDTLS_TEST_RESULT_FAILED, test, line_no, filename);
mbedtls_test_info.test = test;
mbedtls_test_info.line_no = line_no;
mbedtls_test_info.filename = filename;
} }
void mbedtls_test_skip(const char *test, int line_no, const char *filename) void mbedtls_test_skip(const char *test, int line_no, const char *filename)
{ {
mbedtls_test_info.result = MBEDTLS_TEST_RESULT_SKIPPED; mbedtls_test_set_result(MBEDTLS_TEST_RESULT_SKIPPED, test, line_no, filename);
mbedtls_test_info.test = test;
mbedtls_test_info.line_no = line_no;
mbedtls_test_info.filename = filename;
}
void mbedtls_test_set_step(unsigned long step)
{
mbedtls_test_info.step = step;
} }
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C)
@ -156,13 +177,11 @@ unsigned mbedtls_test_case_uses_negative_0 = 0;
void mbedtls_test_info_reset(void) void mbedtls_test_info_reset(void)
{ {
mbedtls_test_info.result = MBEDTLS_TEST_RESULT_SUCCESS; mbedtls_test_set_result(MBEDTLS_TEST_RESULT_SUCCESS, 0, 0, 0);
mbedtls_test_info.step = (unsigned long) (-1); mbedtls_test_set_step((unsigned long) (-1));
mbedtls_test_info.test = 0; mbedtls_test_set_line1(NULL);
mbedtls_test_info.line_no = 0; mbedtls_test_set_line2(NULL);
mbedtls_test_info.filename = 0;
memset(mbedtls_test_info.line1, 0, sizeof(mbedtls_test_info.line1));
memset(mbedtls_test_info.line2, 0, sizeof(mbedtls_test_info.line2));
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C)
mbedtls_test_case_uses_negative_0 = 0; mbedtls_test_case_uses_negative_0 = 0;
#endif #endif
@ -178,20 +197,21 @@ int mbedtls_test_equal(const char *test, int line_no, const char *filename,
return 1; return 1;
} }
if (mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED) { if (mbedtls_test_get_result() == MBEDTLS_TEST_RESULT_FAILED) {
/* We've already recorded the test as having failed. Don't /* We've already recorded the test as having failed. Don't
* overwrite any previous information about the failure. */ * overwrite any previous information about the failure. */
return 0; return 0;
} }
char buf[MBEDTLS_TEST_LINE_LENGTH];
mbedtls_test_fail(test, line_no, filename); mbedtls_test_fail(test, line_no, filename);
(void) mbedtls_snprintf(mbedtls_test_info.line1, (void) mbedtls_snprintf(buf, sizeof(buf),
sizeof(mbedtls_test_info.line1),
"lhs = 0x%016llx = %lld", "lhs = 0x%016llx = %lld",
value1, (long long) value1); value1, (long long) value1);
(void) mbedtls_snprintf(mbedtls_test_info.line2, mbedtls_test_set_line1(buf);
sizeof(mbedtls_test_info.line2), (void) mbedtls_snprintf(buf, sizeof(buf),
"rhs = 0x%016llx = %lld", "rhs = 0x%016llx = %lld",
value2, (long long) value2); value2, (long long) value2);
mbedtls_test_set_line2(buf);
return 0; return 0;
} }
@ -205,20 +225,21 @@ int mbedtls_test_le_u(const char *test, int line_no, const char *filename,
return 1; return 1;
} }
if (mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED) { if (mbedtls_test_get_result() == MBEDTLS_TEST_RESULT_FAILED) {
/* We've already recorded the test as having failed. Don't /* We've already recorded the test as having failed. Don't
* overwrite any previous information about the failure. */ * overwrite any previous information about the failure. */
return 0; return 0;
} }
char buf[MBEDTLS_TEST_LINE_LENGTH];
mbedtls_test_fail(test, line_no, filename); mbedtls_test_fail(test, line_no, filename);
(void) mbedtls_snprintf(mbedtls_test_info.line1, (void) mbedtls_snprintf(buf, sizeof(buf),
sizeof(mbedtls_test_info.line1),
"lhs = 0x%016llx = %llu", "lhs = 0x%016llx = %llu",
value1, value1); value1, value1);
(void) mbedtls_snprintf(mbedtls_test_info.line2, mbedtls_test_set_line1(buf);
sizeof(mbedtls_test_info.line2), (void) mbedtls_snprintf(buf, sizeof(buf),
"rhs = 0x%016llx = %llu", "rhs = 0x%016llx = %llu",
value2, value2); value2, value2);
mbedtls_test_set_line2(buf);
return 0; return 0;
} }
@ -232,20 +253,21 @@ int mbedtls_test_le_s(const char *test, int line_no, const char *filename,
return 1; return 1;
} }
if (mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED) { if (mbedtls_test_get_result() == MBEDTLS_TEST_RESULT_FAILED) {
/* We've already recorded the test as having failed. Don't /* We've already recorded the test as having failed. Don't
* overwrite any previous information about the failure. */ * overwrite any previous information about the failure. */
return 0; return 0;
} }
char buf[MBEDTLS_TEST_LINE_LENGTH];
mbedtls_test_fail(test, line_no, filename); mbedtls_test_fail(test, line_no, filename);
(void) mbedtls_snprintf(mbedtls_test_info.line1, (void) mbedtls_snprintf(buf, sizeof(buf),
sizeof(mbedtls_test_info.line1),
"lhs = 0x%016llx = %lld", "lhs = 0x%016llx = %lld",
(unsigned long long) value1, value1); (unsigned long long) value1, value1);
(void) mbedtls_snprintf(mbedtls_test_info.line2, mbedtls_test_set_line1(buf);
sizeof(mbedtls_test_info.line2), (void) mbedtls_snprintf(buf, sizeof(buf),
"rhs = 0x%016llx = %lld", "rhs = 0x%016llx = %lld",
(unsigned long long) value2, value2); (unsigned long long) value2, value2);
mbedtls_test_set_line2(buf);
return 0; return 0;
} }