alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-30 19:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_update

Browse Source
This commit is contained in:
Angus Gratton
2019-08-08 13:44:24 +10:00
committed by Angus Gratton
parent 1877a9fcd8 16b300bd7a
commit 24d26fccde
2414 changed files with 160787 additions and 45783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/vfs/test/CMakeLists.txt
View File

@@ -1,8 +1,4 @@
set(COMPONENT_SRCDIRS ".")
set(COMPONENT_ADD_INCLUDEDIRS ".")
set(COMPONENT_REQUIRES unity test_utils vfs fatfs spiffs)
set(COMPONENT_ADD_LDFRAGMENTS linker.lf)
register_component()
idf_component_register(SRC_DIRS "."
INCLUDE_DIRS "."
REQUIRES unity test_utils vfs fatfs spiffs
LDFRAGMENTS linker.lf)

4
components/vfs/test/test_vfs_uart.c
View File

@@ -202,7 +202,7 @@ TEST_CASE("can write to UART while another task is reading", "[vfs]")
vSemaphoreDelete(write_arg.done);
}
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
TEST_CASE("Can use termios for UART", "[vfs]")
{
uart_config_t uart_config = {
@@ -328,4 +328,4 @@ TEST_CASE("Can use termios for UART", "[vfs]")
close(uart_fd);
uart_driver_delete(UART_NUM_1);
}
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS