From 44757e94e184fd58a741bdcf92be67779ca1a5c0 Mon Sep 17 00:00:00 2001
From: "sonika.rathi" <sonika.rathi@espressif.com>
Date: Tue, 26 Sep 2023 08:46:55 +0200
Subject: [PATCH] fix(vfs): re-enable vfs tartget tests for esp32-h2

---
 components/vfs/test_apps/main/test_vfs_select.c | 7 +------
 components/vfs/test_apps/main/test_vfs_uart.c   | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/components/vfs/test_apps/main/test_vfs_select.c b/components/vfs/test_apps/main/test_vfs_select.c
index ceab7004f7..7f46a88615 100644
--- a/components/vfs/test_apps/main/test_vfs_select.c
+++ b/components/vfs/test_apps/main/test_vfs_select.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -141,7 +141,6 @@ static void deinit(int uart_fd, int socket_fd)
     close(socket_fd);
 }
 
-#if !CONFIG_IDF_TARGET_ESP32H2 // IDF-6782
 TEST_CASE("UART can do select()", "[vfs]")
 {
     int uart_fd;
@@ -303,8 +302,6 @@ TEST_CASE("UART can do poll() with POLLOUT event", "[vfs]")
     deinit(uart_fd, socket_fd);
 }
 
-#endif
-
 TEST_CASE("socket can do select()", "[vfs]")
 {
     int uart_fd;
@@ -488,7 +485,6 @@ static void inline start_select_task(test_select_task_param_t *param)
     xTaskCreate(select_task, "select_task", 4*1024, (void *) param, 5, NULL);
 }
 
-#if !CONFIG_IDF_TARGET_ESP32H2 // IDF-6782
 TEST_CASE("concurrent selects work", "[vfs]")
 {
     int uart_fd, socket_fd;
@@ -590,7 +586,6 @@ TEST_CASE("concurrent selects work", "[vfs]")
     deinit(uart_fd, socket_fd);
     close(dummy_socket_fd);
 }
-#endif
 
 TEST_CASE("select() works with concurrent mount", "[vfs][fatfs]")
 {
diff --git a/components/vfs/test_apps/main/test_vfs_uart.c b/components/vfs/test_apps/main/test_vfs_uart.c
index 37c0dcfd76..18403fb560 100644
--- a/components/vfs/test_apps/main/test_vfs_uart.c
+++ b/components/vfs/test_apps/main/test_vfs_uart.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -23,7 +23,6 @@
 #include "test_utils.h"
 #include "sdkconfig.h"
 
-#if !CONFIG_IDF_TARGET_ESP32H2 // IDF-6782
 static void fwrite_str_loopback(const char* str, size_t size)
 {
     esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
@@ -125,7 +124,6 @@ TEST_CASE("CRs are removed from the stdin correctly", "[vfs]")
     TEST_ASSERT_EQUAL(2, rb);
     TEST_ASSERT_EQUAL_UINT8_ARRAY("4\n", dst, 2);
 }
-#endif
 
 struct read_task_arg_t {
     char* out_buffer;
@@ -139,7 +137,6 @@ struct write_task_arg_t {
     SemaphoreHandle_t done;
 };
 
-#if !CONFIG_IDF_TARGET_ESP32H2 // IDF-6782
 static void read_task_fn(void* varg)
 {
     struct read_task_arg_t* parg = (struct read_task_arg_t*) varg;
@@ -199,7 +196,6 @@ TEST_CASE("can write to UART while another task is reading", "[vfs]")
     vSemaphoreDelete(read_arg.done);
     vSemaphoreDelete(write_arg.done);
 }
-#endif
 
 TEST_CASE("fcntl supported in UART VFS", "[vfs]")
 {
@@ -212,7 +208,6 @@ TEST_CASE("fcntl supported in UART VFS", "[vfs]")
     TEST_ASSERT_NOT_EQUAL(-1, res);
 }
 
-#if !CONFIG_IDF_TARGET_ESP32H2 // IDF-6782
 #ifdef CONFIG_VFS_SUPPORT_TERMIOS
 TEST_CASE("Can use termios for UART", "[vfs]")
 {
@@ -353,4 +348,3 @@ TEST_CASE("Can use termios for UART", "[vfs]")
     uart_driver_delete(UART_NUM_1);
 }
 #endif // CONFIG_VFS_SUPPORT_TERMIOS
-#endif