mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-03 12:44:33 +02:00
util-test: Fix the conflict target of esp32_test_logo between esp32s2beta and esp32
This commit is contained in:
@@ -1,17 +1,19 @@
|
|||||||
set(COMPONENT_SRCDIRS ".")
|
if(IDF_TARGET STREQUAL "esp32s2beta")
|
||||||
set(COMPONENT_ADD_INCLUDEDIRS ". ${CMAKE_CURRENT_BINARY_DIR}")
|
idf_component_register(SRC_DIRS .
|
||||||
|
INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
set(COMPONENT_REQUIRES unity test_utils nvs_flash ulp esp_common)
|
REQUIRES unity test_utils nvs_flash ulp esp_common
|
||||||
|
)
|
||||||
register_component()
|
|
||||||
|
|
||||||
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
|
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
|
||||||
COMMAND xxd -i "logo.jpg" "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
|
COMMAND xxd -i "logo.jpg" "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
|
||||||
WORKING_DIRECTORY ${COMPONENT_DIR}
|
WORKING_DIRECTORY ${COMPONENT_DIR}
|
||||||
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/logo.jpg")
|
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/logo.jpg")
|
||||||
|
|
||||||
add_custom_target(esp32_test_logo DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h")
|
add_custom_target(esp32s2beta_test_logo DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h")
|
||||||
|
|
||||||
add_dependencies(${COMPONENT_LIB} esp32_test_logo)
|
add_dependencies(${COMPONENT_LIB} esp32s2beta_test_logo)
|
||||||
|
|
||||||
idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND)
|
idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND)
|
||||||
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u ld_include_test_dport_xt_highint5")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
@@ -4,7 +4,8 @@
|
|||||||
|
|
||||||
COMPONENT_EXTRA_CLEAN := test_tjpgd_logo.h
|
COMPONENT_EXTRA_CLEAN := test_tjpgd_logo.h
|
||||||
|
|
||||||
COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
|
COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive \
|
||||||
|
-u ld_include_test_dport_xt_highint5 \
|
||||||
|
|
||||||
COMPONENT_SRCDIRS := .
|
COMPONENT_SRCDIRS := .
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#if CONFIG_COMPILER_STACK_CHECK
|
#if CONFIG_COMPILER_STACK_CHECK
|
||||||
|
|
||||||
static void recur_and_smash()
|
static void recur_and_smash(void)
|
||||||
{
|
{
|
||||||
static int cnt;
|
static int cnt;
|
||||||
volatile uint8_t buf[50];
|
volatile uint8_t buf[50];
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#if CONFIG_COMPILER_STACK_CHECK
|
#if CONFIG_COMPILER_STACK_CHECK
|
||||||
|
|
||||||
static void recur_and_smash_cxx()
|
static void recur_and_smash_cxx(void)
|
||||||
{
|
{
|
||||||
static int cnt;
|
static int cnt;
|
||||||
volatile uint8_t buf[50];
|
volatile uint8_t buf[50];
|
||||||
|
@@ -19,7 +19,7 @@ struct flash_test_ctx {
|
|||||||
/* Base offset in flash for tests. */
|
/* Base offset in flash for tests. */
|
||||||
static size_t start;
|
static size_t start;
|
||||||
|
|
||||||
static void setup_tests()
|
static void setup_tests(void)
|
||||||
{
|
{
|
||||||
if (start == 0) {
|
if (start == 0) {
|
||||||
const esp_partition_t *part = get_test_data_partition();
|
const esp_partition_t *part = get_test_data_partition();
|
||||||
|
@@ -1 +1 @@
|
|||||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 driver heap pthread soc spi_flash vfs
|
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp32s2beta driver heap pthread soc spi_flash vfs
|
||||||
|
@@ -1,2 +1,2 @@
|
|||||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta driver heap pthread soc spi_flash vfs
|
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp32s2beta driver heap pthread soc spi_flash vfs
|
||||||
CONFIG_IDF_TARGET="esp32s2beta"
|
CONFIG_IDF_TARGET="esp32s2beta"
|
Reference in New Issue
Block a user