From 512fdcc6e4a33edc02f8146d4e7cd63c19fac297 Mon Sep 17 00:00:00 2001 From: Hyundo Lee <54927573+hdlee27@users.noreply.github.com> Date: Wed, 21 Oct 2020 10:57:14 +0900 Subject: [PATCH] test: enable IOT_CORE_LOG_FILE to test iot_dump_log (cherry-picked from commit 478c82ba9491edef4a6d571ff0741316db585b71) Signed-off-by: Hyundo Lee <54927573+hdlee27@users.noreply.github.com> --- src/iot_dump_log.c | 4 ++++ stdkconfig.cmake | 6 ++++-- test/TC_FUNC_iot_dump_log.c | 7 ++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/iot_dump_log.c b/src/iot_dump_log.c index fdf74240..2ca72b9b 100644 --- a/src/iot_dump_log.c +++ b/src/iot_dump_log.c @@ -206,6 +206,10 @@ int st_create_log_dump(IOT_CTX *iot_ctx, char **log_dump_output, size_t max_log_ #else #error "Need to choice STDK_IOT_CORE_LOG_FILE_TYPE first" #endif + if (!logfile) { + IOT_ERROR("fail to open log file"); + return IOT_ERROR_BAD_REQ; + } #endif if (need_base64) { diff --git a/stdkconfig.cmake b/stdkconfig.cmake index 00aac1f8..df941913 100644 --- a/stdkconfig.cmake +++ b/stdkconfig.cmake @@ -23,9 +23,11 @@ SET(STDK_UNITTEST_EXTRA_CFLAGS CONFIG_STDK_IOT_CORE_SECURITY_BACKEND_SOFTWARE #CONFIG_STDK_IOT_CORE_EASYSETUP_POSIX_TESTING CONFIG_STDK_IOT_CORE_CRYPTO_SUPPORT_VERIFY - + CONFIG_STDK_IOT_CORE_LOG_FILE + CONFIG_STDK_IOT_CORE_LOG_FILE_RAM_ONLY + CONFIG_STDK_IOT_CORE_LOG_FILE_RAM_BUF_SIZE=8192 #CONFIG_STDK_IOT_CORE_LOG_LEVEL_ERROR #CONFIG_STDK_IOT_CORE_LOG_LEVEL_WARN #CONFIG_STDK_IOT_CORE_LOG_LEVEL_INFO #CONFIG_STDK_IOT_CORE_LOG_LEVEL_DEBUG - ) \ No newline at end of file + ) diff --git a/test/TC_FUNC_iot_dump_log.c b/test/TC_FUNC_iot_dump_log.c index 4851a47c..1ac74256 100644 --- a/test/TC_FUNC_iot_dump_log.c +++ b/test/TC_FUNC_iot_dump_log.c @@ -47,6 +47,11 @@ void TC_iot_dump_create_dump_state_failure(void **state) size_t max_log_dump_size = 0; int mode = 0; iot_error_t err; +#ifdef CONFIG_STDK_IOT_CORE_LOG_FILE + int malloc_test_count = 4; +#else + int malloc_test_count = 3; +#endif // Given : max_log_dump_size is smaller than minimum max_log_dump_size = 1; @@ -57,7 +62,7 @@ void TC_iot_dump_create_dump_state_failure(void **state) mode = IOT_DUMP_MODE_NEED_BASE64 | IOT_DUMP_MODE_NEED_DUMP_STATE; max_log_dump_size = 500; - for (int i = 0; i < 3; i++) { + for (int i = 0; i < malloc_test_count; i++) { // Given: malloc failure do_not_use_mock_iot_os_malloc_failure(); set_mock_iot_os_malloc_failure_with_index(i);