mirror of
https://github.com/espressif/esp-idf.git
synced 2026-09-22 13:01:16 +03:00
fix(esp_system): test with psram timeout on CI
This commit is contained in:
@@ -21,10 +21,8 @@ idf_component_register(SRCS ${srcs}
|
||||
LDFRAGMENTS "linker.lf"
|
||||
)
|
||||
|
||||
if(CONFIG_VFS_SUPPORT_IO)
|
||||
if(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED)
|
||||
target_link_libraries(${COMPONENT_LIB} PUBLIC idf::vfs)
|
||||
endif()
|
||||
if(CONFIG_VFS_SUPPORT_IO AND CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED)
|
||||
target_link_libraries(${COMPONENT_LIB} PUBLIC idf::vfs)
|
||||
target_sources(${COMPONENT_LIB} PRIVATE "src/usb_serial_jtag_vfs.c")
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u usb_serial_jtag_vfs_include_dev_init")
|
||||
endif()
|
||||
|
||||
@@ -35,8 +35,7 @@ endif()
|
||||
|
||||
idf_component_register(SRCS ${srcs}
|
||||
INCLUDE_DIRS ${includes}
|
||||
PRIV_INCLUDE_DIRS ${priv_includes}
|
||||
REQUIRES vfs)
|
||||
PRIV_INCLUDE_DIRS ${priv_includes})
|
||||
|
||||
if(CONFIG_VFS_SUPPORT_IO)
|
||||
# The public header esp_stdio.h includes VFS types when VFS is enabled.
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
#include "esp_err.h"
|
||||
#include "esp_stdio_cli_config.h"
|
||||
#include "esp_vfs_common.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -35,14 +34,6 @@ typedef struct {
|
||||
/** @brief Opaque handle representing a registered console I/O backend. */
|
||||
typedef struct esp_stdio_entry *esp_stdio_handle_t;
|
||||
|
||||
/**
|
||||
* @brief Register the default console VFS backends from Kconfig.
|
||||
*
|
||||
* Called from startup code. Sets up the primary and any Kconfig-selected
|
||||
* auxiliary sinks, and mounts them under /dev/console.
|
||||
*/
|
||||
esp_err_t esp_stdio_register(void);
|
||||
|
||||
/**
|
||||
* @brief Register a VFS backend as a write-only auxiliary sink in the console mux.
|
||||
*
|
||||
|
||||
@@ -43,6 +43,7 @@ esp_err_t esp_stdio_install_io_driver(void)
|
||||
if (esp_stdio_has_user_primary()) {
|
||||
return ESP_OK;
|
||||
}
|
||||
#endif // CONFIG_VFS_SUPPORT_IO
|
||||
|
||||
/* No user primary — proceed with Kconfig default HW init */
|
||||
esp_err_t ret = ESP_FAIL;
|
||||
@@ -79,6 +80,7 @@ esp_err_t esp_stdio_uninstall_io_driver(void)
|
||||
if (esp_stdio_has_user_primary()) {
|
||||
return ESP_OK;
|
||||
}
|
||||
#endif // CONFIG_VFS_SUPPORT_IO
|
||||
|
||||
esp_err_t ret = ESP_FAIL;
|
||||
#if CONFIG_IDF_TARGET_LINUX
|
||||
|
||||
@@ -30,7 +30,7 @@ from pytest_embedded_idf.utils import soc_filtered_targets
|
||||
)
|
||||
def test_esp_system(dut: Dut) -> None:
|
||||
# esp32p4 32MB PSRAM initialize in startup takes more than 30 sec
|
||||
dut.run_all_single_board_cases(timeout=60)
|
||||
dut.run_all_single_board_cases(timeout=120)
|
||||
|
||||
|
||||
def esp_reset_and_wait_ready(dut: Dut) -> None:
|
||||
|
||||
@@ -69,7 +69,7 @@ void test_task_wdt_cpu0(void)
|
||||
}
|
||||
|
||||
#if CONFIG_ESP_SYSTEM_HW_STACK_GUARD
|
||||
#define HWSG_TASK_SIZE 2048
|
||||
#define HWSG_TASK_SIZE 1024
|
||||
__attribute__((optimize("-O0")))
|
||||
static void test_hw_stack_guard_cpu(void* arg)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user