From 18418c83ff15be65327383b7f07c17a40c6d9310 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Thu, 21 Aug 2025 15:46:32 +0200
Subject: [PATCH] ci(common): Update test component dir for IDFv6.0

Update websocket, mdns and eppp test apps
---
 components/eppp_link/test/test_app/CMakeLists.txt   | 10 +++++++++-
 components/esp_websocket_client/test/CMakeLists.txt | 13 ++++++++++---
 components/mdns/tests/unit_test/CMakeLists.txt      | 12 ++++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/components/eppp_link/test/test_app/CMakeLists.txt b/components/eppp_link/test/test_app/CMakeLists.txt
index cc4589c45..dd39c298a 100644
--- a/components/eppp_link/test/test_app/CMakeLists.txt
+++ b/components/eppp_link/test/test_app/CMakeLists.txt
@@ -1,7 +1,15 @@
 # The following four lines of boilerplate have to be in your project's CMakeLists
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
-set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/tools/unit-test-app/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
+    set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
+else()
+    set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
+endif()
+
+set(EXTRA_COMPONENT_DIRS ${test_component_dir})
+
 project(test_app)
diff --git a/components/esp_websocket_client/test/CMakeLists.txt b/components/esp_websocket_client/test/CMakeLists.txt
index 9acd84302..2052fc087 100644
--- a/components/esp_websocket_client/test/CMakeLists.txt
+++ b/components/esp_websocket_client/test/CMakeLists.txt
@@ -1,8 +1,15 @@
 # This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(EXTRA_COMPONENT_DIRS    ../../esp_websocket_client
-                            "$ENV{IDF_PATH}/tools/unit-test-app/components")
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
+    set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
+else()
+    set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
+endif()
+
+set(EXTRA_COMPONENT_DIRS    ../../esp_websocket_client
+                            ${test_component_dir})
+
 project(websocket_unit_test)
diff --git a/components/mdns/tests/unit_test/CMakeLists.txt b/components/mdns/tests/unit_test/CMakeLists.txt
index 450d475e4..32bdad890 100644
--- a/components/mdns/tests/unit_test/CMakeLists.txt
+++ b/components/mdns/tests/unit_test/CMakeLists.txt
@@ -1,7 +1,15 @@
 # This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(EXTRA_COMPONENT_DIRS ../.. "$ENV{IDF_PATH}/tools/unit-test-app/components")
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
+    set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
+else()
+    set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
+endif()
+
+set(EXTRA_COMPONENT_DIRS ../..
+                         ${test_component_dir})
+
 project(mdns_test)