feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

skip memory callback tests with STATIC_MEMORY and LINUXKM

Browse Source
This commit is contained in:
Elms
2021-04-19 14:47:45 -07:00
parent 7a98c517e4
commit 3deb635155
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/test/test.c
View File

@ -36345,7 +36345,7 @@ WOLFSSL_TEST_SUBROUTINE int mutex_test(void)
#if defined(USE_WOLFSSL_MEMORY) && !defined(FREERTOS) #if defined(USE_WOLFSSL_MEMORY) && !defined(FREERTOS)
#ifndef WOLFSSL_NO_MALLOC #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY)
static int malloc_cnt = 0; static int malloc_cnt = 0;
static int realloc_cnt = 0; static int realloc_cnt = 0;
static int free_cnt = 0; static int free_cnt = 0;
@ -36388,7 +36388,7 @@ static void *my_Realloc_cb(void *ptr, size_t size)
WOLFSSL_TEST_SUBROUTINE int memcb_test(void) WOLFSSL_TEST_SUBROUTINE int memcb_test(void)
{ {
int ret = 0; int ret = 0;
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY)
byte* b = NULL; byte* b = NULL;
#endif #endif
wolfSSL_Malloc_cb mc; wolfSSL_Malloc_cb mc;
@ -36399,7 +36399,8 @@ WOLFSSL_TEST_SUBROUTINE int memcb_test(void)
if (wolfSSL_GetAllocators(&mc, &fc, &rc) != 0) if (wolfSSL_GetAllocators(&mc, &fc, &rc) != 0)
return -13800; return -13800;
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY)
/* test realloc */ /* test realloc */
b = (byte*)XREALLOC(b, 1024, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); b = (byte*)XREALLOC(b, 1024, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (b == NULL) { if (b == NULL) {
@ -36427,7 +36428,7 @@ WOLFSSL_TEST_SUBROUTINE int memcb_test(void)
ret = -13803; ret = -13803;
#endif /* !WOLFSSL_NO_MALLOC */ #endif /* !WOLFSSL_NO_MALLOC */
#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) #if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY)
exit_memcb: exit_memcb:
#endif #endif