Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esp32, mbedtls: check component name when enabling test flags

Browse source 
Otherwise flags get enabled even when building tests for other components.
This commit is contained in:
Ivan Grokhotkov 2018-11-20 00:49:38 +08:00
parent 00a13bd8d3
commit 8027adaf81
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esp32/CMakeLists.txt
View file

@ -158,7 +158,7 @@ else()
endif() endif()
# Enable dynamic esp_timer overflow value if building unit tests # Enable dynamic esp_timer overflow value if building unit tests
if(NOT "${BUILD_TEST_COMPONENTS}" EQUAL "") if(esp32_test IN_LIST BUILD_TEST_COMPONENTS)
add_definitions(-DESP_TIMER_DYNAMIC_OVERFLOW_VAL) add_definitions(-DESP_TIMER_DYNAMIC_OVERFLOW_VAL)
endif() endif()
endif() endif()

2
components/esp32/Makefile.projbuild
View file

@ -39,7 +39,7 @@ CXXFLAGS+=-mfix-esp32-psram-cache-issue
endif endif
# Enable dynamic esp_timer overflow value if building unit tests # Enable dynamic esp_timer overflow value if building unit tests
ifneq ("$(TEST_COMPONENTS_LIST)","") ifneq ("$(filter esp32,$(TEST_COMPONENTS_LIST))","")
CPPFLAGS += -DESP_TIMER_DYNAMIC_OVERFLOW_VAL CPPFLAGS += -DESP_TIMER_DYNAMIC_OVERFLOW_VAL
endif endif
ESP32_LINKER_SCRIPT_TEMPLATE := $(COMPONENT_PATH)/ld/esp32.common.ld.in ESP32_LINKER_SCRIPT_TEMPLATE := $(COMPONENT_PATH)/ld/esp32.common.ld.in

5
components/mbedtls/CMakeLists.txt
View file

@ -94,3 +94,8 @@ register_component()
target_compile_definitions(mbedtls PUBLIC target_compile_definitions(mbedtls PUBLIC
-DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h"
) )
# Catch usage of deprecated mbedTLS functions when building tests
if(mbedtls_test IN_LIST BUILD_TEST_COMPONENTS)
add_definitions(-DMBEDTLS_DEPRECATED_WARNING)
endif()

2
components/mbedtls/Makefile.projbuild
View file

@ -3,6 +3,6 @@
CPPFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' CPPFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"'
# Catch usage of deprecated mbedTLS functions when building tests # Catch usage of deprecated mbedTLS functions when building tests
ifneq ("$(TEST_COMPONENTS_LIST)","") ifneq ("$(filter mbedtls,$(TEST_COMPONENTS_LIST))","")
CPPFLAGS += -DMBEDTLS_DEPRECATED_WARNING CPPFLAGS += -DMBEDTLS_DEPRECATED_WARNING
endif endif