From 3deb63515575f3312df351090971be66e5a0c11f Mon Sep 17 00:00:00 2001 From: Elms Date: Mon, 19 Apr 2021 14:47:45 -0700 Subject: [PATCH] skip memory callback tests with `STATIC_MEMORY` and `LINUXKM` --- wolfcrypt/test/test.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index e7f33cb1b..fde0f7ad5 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -36345,7 +36345,7 @@ WOLFSSL_TEST_SUBROUTINE int mutex_test(void) #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 realloc_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) { 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; #endif wolfSSL_Malloc_cb mc; @@ -36399,7 +36399,8 @@ WOLFSSL_TEST_SUBROUTINE int memcb_test(void) if (wolfSSL_GetAllocators(&mc, &fc, &rc) != 0) return -13800; -#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) +#if !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_STATIC_MEMORY) + /* test realloc */ b = (byte*)XREALLOC(b, 1024, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (b == NULL) { @@ -36427,7 +36428,7 @@ WOLFSSL_TEST_SUBROUTINE int memcb_test(void) ret = -13803; #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: #endif