mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-19 14:26:01 -04:00
Merge branch 'bugfix/console_no_vfs' into 'master'
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:
commit
85e570b8ee
@ -7,6 +7,7 @@ components/esp_system/test_apps/cache_panic:
|
|||||||
components/esp_system/test_apps/console:
|
components/esp_system/test_apps/console:
|
||||||
disable:
|
disable:
|
||||||
- if: CONFIG_NAME == "serial_jtag_only" and SOC_USB_SERIAL_JTAG_SUPPORTED != 1
|
- 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:
|
components/esp_system/test_apps/esp_system_unity_tests:
|
||||||
disable:
|
disable:
|
||||||
|
@ -38,9 +38,10 @@ def test_esp_system_console_no_output_uart(dut: Dut) -> None:
|
|||||||
|
|
||||||
@pytest.mark.usb_serial_jtag
|
@pytest.mark.usb_serial_jtag
|
||||||
@pytest.mark.parametrize(
|
@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,
|
indirect=True,
|
||||||
)
|
)
|
||||||
|
@ -1 +1,2 @@
|
|||||||
CONFIG_ESP_CONSOLE_NONE=y
|
CONFIG_ESP_CONSOLE_NONE=y
|
||||||
|
CONFIG_VFS_SUPPORT_IO=y
|
||||||
|
@ -0,0 +1,2 @@
|
|||||||
|
CONFIG_ESP_CONSOLE_NONE=y
|
||||||
|
CONFIG_VFS_SUPPORT_IO=n
|
@ -1,3 +1,4 @@
|
|||||||
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
|
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
|
||||||
# Disabled due to semihosting issue IDF-9574
|
# Disabled due to semihosting issue IDF-9574
|
||||||
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=n
|
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=n
|
||||||
|
CONFIG_VFS_SUPPORT_IO=y
|
||||||
|
@ -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
|
@ -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)
|
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;
|
const char* cdata = (const char*) data;
|
||||||
if (fd == STDOUT_FILENO || fd == STDERR_FILENO) {
|
if (fd == STDOUT_FILENO || fd == STDERR_FILENO) {
|
||||||
for (size_t i = 0; i < size; ++i) {
|
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;
|
return size;
|
||||||
}
|
}
|
||||||
|
#endif //!CONFIG_ESP_CONSOLE_NONE
|
||||||
__errno_r(r) = EBADF;
|
__errno_r(r) = EBADF;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t _read_r_console(struct _reent *r, int fd, void * data, size_t size)
|
ssize_t _read_r_console(struct _reent *r, int fd, void * data, size_t size)
|
||||||
{
|
{
|
||||||
|
#if !CONFIG_ESP_CONSOLE_NONE
|
||||||
char* cdata = (char*) data;
|
char* cdata = (char*) data;
|
||||||
if (fd == STDIN_FILENO) {
|
if (fd == STDIN_FILENO) {
|
||||||
size_t received;
|
size_t received;
|
||||||
@ -57,6 +60,7 @@ ssize_t _read_r_console(struct _reent *r, int fd, void * data, size_t size)
|
|||||||
}
|
}
|
||||||
return received;
|
return received;
|
||||||
}
|
}
|
||||||
|
#endif //!CONFIG_ESP_CONSOLE_NONE
|
||||||
__errno_r(r) = EBADF;
|
__errno_r(r) = EBADF;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user