mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

util-test: Fix the conflict target of esp32_test_logo between esp32s2beta and esp32

pull/4273/head
Li Shuai 2019-08-06 16:36:16 +08:00
rodzic d5a9b1a240
commit d48aac96a1
7 zmienionych plików z 22 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
components/esp32s2beta/test/CMakeLists.txt
Wyświetl plik

@ -1,17 +1,19 @@
set(COMPONENT_SRCDIRS ".")
set(COMPONENT_ADD_INCLUDEDIRS ". ${CMAKE_CURRENT_BINARY_DIR}")
if(IDF_TARGET STREQUAL "esp32s2beta")
idf_component_register(SRC_DIRS .
INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
REQUIRES unity test_utils nvs_flash ulp esp_common
)
set(COMPONENT_REQUIRES unity test_utils nvs_flash ulp esp_common)
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"
WORKING_DIRECTORY ${COMPONENT_DIR}
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/logo.jpg")
register_component()
add_custom_target(esp32s2beta_test_logo DEPENDS "${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"
WORKING_DIRECTORY ${COMPONENT_DIR}
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/logo.jpg")
add_dependencies(${COMPONENT_LIB} esp32s2beta_test_logo)
add_custom_target(esp32_test_logo DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h")
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()
add_dependencies(${COMPONENT_LIB} esp32_test_logo)
idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND)

3
components/esp32s2beta/test/component.mk
Wyświetl plik

@ -4,7 +4,8 @@
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 := .

2
components/esp32s2beta/test/test_stack_check.c
Wyświetl plik

@ -2,7 +2,7 @@
#if CONFIG_COMPILER_STACK_CHECK
static void recur_and_smash()
static void recur_and_smash(void)
{
static int cnt;
volatile uint8_t buf[50];

2
components/esp32s2beta/test/test_stack_check_cxx.cpp
Wyświetl plik

@ -2,7 +2,7 @@
#if CONFIG_COMPILER_STACK_CHECK
static void recur_and_smash_cxx()
static void recur_and_smash_cxx(void)
{
static int cnt;
volatile uint8_t buf[50];

2
components/spi_flash/test/test_spi_flash.c
Wyświetl plik

@ -19,7 +19,7 @@ struct flash_test_ctx {
/* Base offset in flash for tests. */
static size_t start;
static void setup_tests()
static void setup_tests(void)
{
if (start == 0) {
const esp_partition_t *part = get_test_data_partition();

2
tools/unit-test-app/configs/default_2
Wyświetl plik

@ -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

4
tools/unit-test-app/configs/default_2_s2
Wyświetl plik

@ -1,2 +1,2 @@
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta driver heap pthread soc spi_flash vfs
CONFIG_IDF_TARGET="esp32s2beta"
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp32s2beta driver heap pthread soc spi_flash vfs
CONFIG_IDF_TARGET="esp32s2beta"