alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/console_no_vfs' into 'master'

Browse Source 
test(console): add tests for console with vfs disabled

Closes IDF-9367 and IDF-9578

See merge request espressif/esp-idf!31455
This commit is contained in:
Marius Vikhammer 2024-08-13 12:20:44 +08:00
commit 85e570b8ee
7 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_system/test_apps/.build-test-rules.yml
View File

@ -7,6 +7,7 @@ components/esp_system/test_apps/cache_panic:
components/esp_system/test_apps/console:
disable:
- if: CONFIG_NAME == "serial_jtag_only" and SOC_USB_SERIAL_JTAG_SUPPORTED != 1
- if: CONFIG_NAME == "serial_jtag_only_no_vfs" and SOC_USB_SERIAL_JTAG_SUPPORTED != 1
components/esp_system/test_apps/esp_system_unity_tests:
disable:

5
components/esp_system/test_apps/console/pytest_esp_system_console_tests.py
View File

@ -38,9 +38,10 @@ def test_esp_system_console_no_output_uart(dut: Dut) -> None:
@pytest.mark.usb_serial_jtag
@pytest.mark.parametrize(
'port, config',
'port, flash_port, config',
[
pytest.param('/dev/serial_ports/ttyACM-esp32', 'serial_jtag_only', marks=JTAG_SERIAL_MARKS),
pytest.param('/dev/serial_ports/ttyACM-esp32', '/dev/serial_ports/ttyUSB-esp32', 'serial_jtag_only', marks=JTAG_SERIAL_MARKS),
pytest.param('/dev/serial_ports/ttyACM-esp32', '/dev/serial_ports/ttyUSB-esp32', 'serial_jtag_only_no_vfs', marks=JTAG_SERIAL_MARKS),
],
indirect=True,
)

1
components/esp_system/test_apps/console/sdkconfig.ci.console_none
View File

@ -1 +1,2 @@
CONFIG_ESP_CONSOLE_NONE=y
CONFIG_VFS_SUPPORT_IO=y

2
components/esp_system/test_apps/console/sdkconfig.ci.console_none_no_vfs Normal file
View File

@ -0,0 +1,2 @@
CONFIG_ESP_CONSOLE_NONE=y
CONFIG_VFS_SUPPORT_IO=n

1
components/esp_system/test_apps/console/sdkconfig.ci.serial_jtag_only
View File

@ -1,3 +1,4 @@
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
# Disabled due to semihosting issue IDF-9574
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=n
CONFIG_VFS_SUPPORT_IO=y

4
components/esp_system/test_apps/console/sdkconfig.ci.serial_jtag_only_no_vfs Normal file
View File

@ -0,0 +1,4 @@
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
# Disabled due to semihosting issue IDF-9574
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=n
CONFIG_VFS_SUPPORT_IO=n

4
components/newlib/syscalls.c
View File

@ -29,6 +29,7 @@ static int syscall_not_implemented_aborts(void)
ssize_t _write_r_console(struct _reent *r, int fd, const void * data, size_t size)
{
#if !CONFIG_ESP_CONSOLE_NONE
const char* cdata = (const char*) data;
if (fd == STDOUT_FILENO || fd == STDERR_FILENO) {
for (size_t i = 0; i < size; ++i) {
@ -36,12 +37,14 @@ ssize_t _write_r_console(struct _reent *r, int fd, const void * data, size_t siz
}
return size;
}
#endif //!CONFIG_ESP_CONSOLE_NONE
__errno_r(r) = EBADF;
return -1;
}
ssize_t _read_r_console(struct _reent *r, int fd, void * data, size_t size)
{
#if !CONFIG_ESP_CONSOLE_NONE
char* cdata = (char*) data;
if (fd == STDIN_FILENO) {
size_t received;
@ -57,6 +60,7 @@ ssize_t _read_r_console(struct _reent *r, int fd, void * data, size_t size)
}
return received;
}
#endif //!CONFIG_ESP_CONSOLE_NONE
__errno_r(r) = EBADF;
return -1;
}