From 2925288e514a61bdd27aa90e68545275b6f7eeb2 Mon Sep 17 00:00:00 2001 From: Euripedes Rocha Filho Date: Mon, 22 Sep 2025 12:39:29 +0200 Subject: [PATCH] chore: Reorganize file structure This just move files to their expected locations. --- .gitlab-ci.yml | 2 +- .../mqtt/host_test/mocks/heap/CMakeLists.txt | 4 ---- .../mqtt/host_test/mocks/heap/heap_mock.c | 16 ---------------- .../protocols/mqtt.rst => index.rst} | 0 .../protocols/mqtt.rst => index.rst} | 0 .../mqtt => }/custom_outbox/CMakeLists.txt | 0 .../mqtt => }/custom_outbox/README.md | 0 .../mqtt => }/custom_outbox/main/CMakeLists.txt | 0 .../custom_outbox/main/Kconfig.projbuild | 0 .../mqtt => }/custom_outbox/main/app_main.c | 0 .../custom_outbox/main/custom_outbox.cpp | 0 .../custom_outbox/main/idf_component.yml | 0 .../custom_outbox/sdkconfig.ci.esp32c6 | 0 .../mqtt => }/custom_outbox/sdkconfig.defaults | 0 examples/{protocols => }/mqtt5/CMakeLists.txt | 0 examples/{protocols => }/mqtt5/README.md | 0 .../mqtt/tcp => mqtt5}/main/CMakeLists.txt | 0 .../mqtt/tcp => mqtt5}/main/Kconfig.projbuild | 0 examples/{protocols => }/mqtt5/main/app_main.c | 0 .../mqtt/ssl => mqtt5}/main/idf_component.yml | 0 examples/{protocols => }/mqtt5/pytest_mqtt5.py | 0 examples/{protocols => }/mqtt5/sdkconfig.ci | 0 .../{protocols => }/mqtt5/sdkconfig.defaults | 0 .../{protocols/mqtt => }/ssl/CMakeLists.txt | 0 examples/{protocols/mqtt => }/ssl/README.md | 0 .../mqtt => }/ssl/main/CMakeLists.txt | 0 .../mqtt => }/ssl/main/Kconfig.projbuild | 0 .../{protocols/mqtt => }/ssl/main/app_main.c | 0 .../main/idf_component.yml | 0 .../ssl/main/mqtt_eclipseprojects_io.pem | 0 .../{protocols/mqtt => }/ssl/pytest_mqtt_ssl.py | 0 examples/{protocols/mqtt => }/ssl/sdkconfig.ci | 0 .../{protocols/mqtt => }/ssl_ds/CMakeLists.txt | 0 examples/{protocols/mqtt => }/ssl_ds/README.md | 0 .../mqtt => }/ssl_ds/main/CMakeLists.txt | 0 .../{protocols/mqtt => }/ssl_ds/main/app_main.c | 0 .../mqtt => }/ssl_ds/main/idf_component.yml | 0 .../mqtt => }/ssl_ds/main/mosquitto.org.crt | 0 .../{protocols/mqtt => }/ssl_ds/partitions.csv | 0 .../mqtt => }/ssl_ds/sdkconfig.defaults | 0 .../mqtt => }/ssl_ds/sdkconfig.defaults.esp32h2 | 0 .../mqtt => }/ssl_mutual_auth/CMakeLists.txt | 0 .../mqtt => }/ssl_mutual_auth/README.md | 0 .../ssl_mutual_auth/main/CMakeLists.txt | 0 .../mqtt => }/ssl_mutual_auth/main/app_main.c | 0 .../mqtt => }/ssl_mutual_auth/main/client.crt | 0 .../mqtt => }/ssl_mutual_auth/main/client.key | 0 .../main/idf_component.yml | 0 .../ssl_mutual_auth/main/mosquitto.org.crt | 0 .../{protocols/mqtt => }/ssl_psk/CMakeLists.txt | 0 examples/{protocols/mqtt => }/ssl_psk/README.md | 0 .../mqtt => }/ssl_psk/main/CMakeLists.txt | 0 .../mqtt => }/ssl_psk/main/app_main.c | 0 .../mqtt/ws => ssl_psk}/main/idf_component.yml | 0 .../mqtt => }/ssl_psk/sdkconfig.defaults | 0 .../{protocols/mqtt => }/tcp/CMakeLists.txt | 0 examples/{protocols/mqtt => }/tcp/README.md | 0 .../mqtt5 => tcp}/main/CMakeLists.txt | 0 .../mqtt5 => tcp}/main/Kconfig.projbuild | 0 .../{protocols/mqtt => }/tcp/main/app_main.c | 0 .../mqtt => }/tcp/main/idf_component.yml | 0 .../{protocols/mqtt => }/tcp/pytest_mqtt_tcp.py | 0 examples/{protocols/mqtt => }/tcp/sdkconfig.ci | 0 .../mqtt => }/tcp/sdkconfig.ci.p4_eppp | 0 .../mqtt => }/tcp/sdkconfig.ci.p4_wifi | 0 .../mqtt => }/tcp/sdkconfig.ci.ppp_connect | 0 examples/{protocols/mqtt => }/ws/CMakeLists.txt | 0 examples/{protocols/mqtt => }/ws/README.md | 0 .../{protocols/mqtt => }/ws/main/CMakeLists.txt | 0 .../mqtt => }/ws/main/Kconfig.projbuild | 0 .../{protocols/mqtt => }/ws/main/app_main.c | 0 .../mqtt/wss => ws}/main/idf_component.yml | 0 .../mqtt => }/ws/pytest_mqtt_ws_example.py | 0 examples/{protocols/mqtt => }/ws/sdkconfig.ci | 0 .../{protocols/mqtt => }/wss/CMakeLists.txt | 0 examples/{protocols/mqtt => }/wss/README.md | 0 .../mqtt => }/wss/main/CMakeLists.txt | 0 .../mqtt => }/wss/main/Kconfig.projbuild | 0 .../{protocols/mqtt => }/wss/main/app_main.c | 0 .../mqtt5 => wss}/main/idf_component.yml | 0 .../wss/main/mqtt_eclipseprojects_io.pem | 0 .../mqtt => }/wss/pytest_mqtt_wss_example.py | 0 examples/{protocols/mqtt => }/wss/sdkconfig.ci | 0 .../test_apps => test}/.build-test-rules.yml | 0 .../apps}/build_test/CMakeLists.txt | 0 .../mqtt => test/apps}/build_test/README.md | 0 .../apps}/build_test/main/CMakeLists.txt | 0 .../apps}/build_test/main/mqtt_app.cpp | 0 .../apps}/common/CMakeLists.txt | 0 .../apps}/common/include/test_mqtt_connection.h | 0 .../apps}/common/test_mqtt_connection.c | 0 .../test_mqtt => test/apps/mqtt}/CMakeLists.txt | 0 .../test_mqtt => test/apps/mqtt}/README.md | 0 .../apps/mqtt}/main/CMakeLists.txt | 0 .../apps/mqtt}/main/Kconfig.projbuild | 0 .../apps/mqtt}/main/test_mqtt.c | 0 .../apps/mqtt}/main/test_mqtt_client_broker.c | 0 .../apps/mqtt}/main/test_mqtt_client_broker.h | 0 .../apps/mqtt}/pytest_mqtt_ut.py | 0 .../apps/mqtt}/sdkconfig.ci.default | 0 .../apps/mqtt}/sdkconfig.defaults | 0 .../apps/mqtt5}/CMakeLists.txt | 0 .../test_mqtt5 => test/apps/mqtt5}/README.md | 0 .../apps/mqtt5}/main/CMakeLists.txt | 0 .../apps/mqtt5}/main/Kconfig.projbuild | 0 .../apps/mqtt5}/main/test_mqtt5.c | 0 .../apps/mqtt5}/main/test_mqtt5_client_broker.c | 0 .../apps/mqtt5}/main/test_mqtt5_client_broker.h | 0 .../apps/mqtt5}/pytest_mqtt5_ut.py | 0 .../apps/mqtt5}/sdkconfig.ci.default | 0 .../apps/mqtt5}/sdkconfig.defaults | 0 .../apps}/publish_connect_test/CMakeLists.txt | 0 .../apps}/publish_connect_test/README.md | 0 .../apps}/publish_connect_test/ca.crt | 0 .../apps}/publish_connect_test/ca.der | Bin .../apps}/publish_connect_test/ca.key | 0 .../apps}/publish_connect_test/client_inv.crt | 0 .../publish_connect_test/client_no_pwd.key | 0 .../apps}/publish_connect_test/client_pwd.crt | 0 .../apps}/publish_connect_test/client_pwd.key | 0 .../publish_connect_test/main/CMakeLists.txt | 0 .../publish_connect_test/main/Kconfig.projbuild | 0 .../publish_connect_test/main/connect_test.c | 0 .../publish_connect_test/main/idf_component.yml | 0 .../main/mqtt_eclipseprojects_io.pem | 0 .../main/publish_connect_test.c | 0 .../main/publish_connect_test.h | 0 .../publish_connect_test/main/publish_test.c | 0 .../publish_connect_test/pytest_mqtt_app.py | 0 .../pytest_mqtt_publish_app.py | 0 .../publish_connect_test/sdkconfig.ci.default | 0 .../sdkconfig.ci.local_broker | 0 .../apps}/publish_connect_test/sdkconfig.qemu | 0 .../apps}/publish_connect_test/server.key | 0 {host_test => test/host}/CMakeLists.txt | 0 {host_test => test/host}/README.md | 0 {host_test => test/host}/main/CMakeLists.txt | 0 {host_test => test/host}/main/Kconfig | 0 {host_test => test/host}/main/idf_component.yml | 0 .../host}/main/test_mqtt_client.cpp | 0 .../host}/mocks/include/sys/queue.h | 0 {host_test => test/host}/sdkconfig.ci.coverage | 0 {host_test => test/host}/sdkconfig.defaults | 0 143 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 components/mqtt/host_test/mocks/heap/CMakeLists.txt delete mode 100644 components/mqtt/host_test/mocks/heap/heap_mock.c rename docs/en/{api-reference/protocols/mqtt.rst => index.rst} (100%) rename docs/zh_CN/{api-reference/protocols/mqtt.rst => index.rst} (100%) rename examples/{protocols/mqtt => }/custom_outbox/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/custom_outbox/README.md (100%) rename examples/{protocols/mqtt => }/custom_outbox/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/custom_outbox/main/Kconfig.projbuild (100%) rename examples/{protocols/mqtt => }/custom_outbox/main/app_main.c (100%) rename examples/{protocols/mqtt => }/custom_outbox/main/custom_outbox.cpp (100%) rename examples/{protocols/mqtt => }/custom_outbox/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/custom_outbox/sdkconfig.ci.esp32c6 (100%) rename examples/{protocols/mqtt => }/custom_outbox/sdkconfig.defaults (100%) rename examples/{protocols => }/mqtt5/CMakeLists.txt (100%) rename examples/{protocols => }/mqtt5/README.md (100%) rename examples/{protocols/mqtt/tcp => mqtt5}/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt/tcp => mqtt5}/main/Kconfig.projbuild (100%) rename examples/{protocols => }/mqtt5/main/app_main.c (100%) rename examples/{protocols/mqtt/ssl => mqtt5}/main/idf_component.yml (100%) rename examples/{protocols => }/mqtt5/pytest_mqtt5.py (100%) rename examples/{protocols => }/mqtt5/sdkconfig.ci (100%) rename examples/{protocols => }/mqtt5/sdkconfig.defaults (100%) rename examples/{protocols/mqtt => }/ssl/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl/README.md (100%) rename examples/{protocols/mqtt => }/ssl/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl/main/Kconfig.projbuild (100%) rename examples/{protocols/mqtt => }/ssl/main/app_main.c (100%) rename examples/{protocols/mqtt/ssl_mutual_auth => ssl}/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/ssl/main/mqtt_eclipseprojects_io.pem (100%) rename examples/{protocols/mqtt => }/ssl/pytest_mqtt_ssl.py (100%) rename examples/{protocols/mqtt => }/ssl/sdkconfig.ci (100%) rename examples/{protocols/mqtt => }/ssl_ds/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl_ds/README.md (100%) rename examples/{protocols/mqtt => }/ssl_ds/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl_ds/main/app_main.c (100%) rename examples/{protocols/mqtt => }/ssl_ds/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/ssl_ds/main/mosquitto.org.crt (100%) rename examples/{protocols/mqtt => }/ssl_ds/partitions.csv (100%) rename examples/{protocols/mqtt => }/ssl_ds/sdkconfig.defaults (100%) rename examples/{protocols/mqtt => }/ssl_ds/sdkconfig.defaults.esp32h2 (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/README.md (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/main/app_main.c (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/main/client.crt (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/main/client.key (100%) rename examples/{protocols/mqtt/ssl_psk => ssl_mutual_auth}/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/ssl_mutual_auth/main/mosquitto.org.crt (100%) rename examples/{protocols/mqtt => }/ssl_psk/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl_psk/README.md (100%) rename examples/{protocols/mqtt => }/ssl_psk/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ssl_psk/main/app_main.c (100%) rename examples/{protocols/mqtt/ws => ssl_psk}/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/ssl_psk/sdkconfig.defaults (100%) rename examples/{protocols/mqtt => }/tcp/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/tcp/README.md (100%) rename examples/{protocols/mqtt5 => tcp}/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt5 => tcp}/main/Kconfig.projbuild (100%) rename examples/{protocols/mqtt => }/tcp/main/app_main.c (100%) rename examples/{protocols/mqtt => }/tcp/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/tcp/pytest_mqtt_tcp.py (100%) rename examples/{protocols/mqtt => }/tcp/sdkconfig.ci (100%) rename examples/{protocols/mqtt => }/tcp/sdkconfig.ci.p4_eppp (100%) rename examples/{protocols/mqtt => }/tcp/sdkconfig.ci.p4_wifi (100%) rename examples/{protocols/mqtt => }/tcp/sdkconfig.ci.ppp_connect (100%) rename examples/{protocols/mqtt => }/ws/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ws/README.md (100%) rename examples/{protocols/mqtt => }/ws/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/ws/main/Kconfig.projbuild (100%) rename examples/{protocols/mqtt => }/ws/main/app_main.c (100%) rename examples/{protocols/mqtt/wss => ws}/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/ws/pytest_mqtt_ws_example.py (100%) rename examples/{protocols/mqtt => }/ws/sdkconfig.ci (100%) rename examples/{protocols/mqtt => }/wss/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/wss/README.md (100%) rename examples/{protocols/mqtt => }/wss/main/CMakeLists.txt (100%) rename examples/{protocols/mqtt => }/wss/main/Kconfig.projbuild (100%) rename examples/{protocols/mqtt => }/wss/main/app_main.c (100%) rename examples/{protocols/mqtt5 => wss}/main/idf_component.yml (100%) rename examples/{protocols/mqtt => }/wss/main/mqtt_eclipseprojects_io.pem (100%) rename examples/{protocols/mqtt => }/wss/pytest_mqtt_wss_example.py (100%) rename examples/{protocols/mqtt => }/wss/sdkconfig.ci (100%) rename {components/mqtt/test_apps => test}/.build-test-rules.yml (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/build_test/CMakeLists.txt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/build_test/README.md (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/build_test/main/CMakeLists.txt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/build_test/main/mqtt_app.cpp (100%) rename {components/mqtt/test_apps => test/apps}/common/CMakeLists.txt (100%) rename {components/mqtt/test_apps => test/apps}/common/include/test_mqtt_connection.h (100%) rename {components/mqtt/test_apps => test/apps}/common/test_mqtt_connection.c (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/CMakeLists.txt (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/README.md (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/main/CMakeLists.txt (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/main/Kconfig.projbuild (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/main/test_mqtt.c (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/main/test_mqtt_client_broker.c (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/main/test_mqtt_client_broker.h (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/pytest_mqtt_ut.py (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/sdkconfig.ci.default (100%) rename {components/mqtt/test_apps/test_mqtt => test/apps/mqtt}/sdkconfig.defaults (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/CMakeLists.txt (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/README.md (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/main/CMakeLists.txt (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/main/Kconfig.projbuild (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/main/test_mqtt5.c (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/main/test_mqtt5_client_broker.c (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/main/test_mqtt5_client_broker.h (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/pytest_mqtt5_ut.py (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/sdkconfig.ci.default (100%) rename {components/mqtt/test_apps/test_mqtt5 => test/apps/mqtt5}/sdkconfig.defaults (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/CMakeLists.txt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/README.md (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/ca.crt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/ca.der (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/ca.key (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/client_inv.crt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/client_no_pwd.key (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/client_pwd.crt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/client_pwd.key (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/CMakeLists.txt (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/Kconfig.projbuild (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/connect_test.c (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/idf_component.yml (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/mqtt_eclipseprojects_io.pem (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/publish_connect_test.c (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/publish_connect_test.h (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/main/publish_test.c (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/pytest_mqtt_app.py (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/pytest_mqtt_publish_app.py (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/sdkconfig.ci.default (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/sdkconfig.ci.local_broker (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/sdkconfig.qemu (100%) rename {tools/test_apps/protocols/mqtt => test/apps}/publish_connect_test/server.key (100%) rename {host_test => test/host}/CMakeLists.txt (100%) rename {host_test => test/host}/README.md (100%) rename {host_test => test/host}/main/CMakeLists.txt (100%) rename {host_test => test/host}/main/Kconfig (100%) rename {host_test => test/host}/main/idf_component.yml (100%) rename {host_test => test/host}/main/test_mqtt_client.cpp (100%) rename {host_test => test/host}/mocks/include/sys/queue.h (100%) rename {host_test => test/host}/sdkconfig.ci.coverage (100%) rename {host_test => test/host}/sdkconfig.defaults (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fc30b7..aadcf47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ build_and_host_test: script: # Replace the IDF's default esp-mqtt with this version - rm -rf $IDF_PATH/components/mqtt/esp-mqtt && cp -r $MQTT_PATH $IDF_PATH/components/mqtt/ - - cd $IDF_PATH/components/mqtt/esp-mqtt/host_test + - cd $IDF_PATH/components/mqtt/esp-mqtt/test/host - idf.py build - build/host_mqtt_client_test.elf diff --git a/components/mqtt/host_test/mocks/heap/CMakeLists.txt b/components/mqtt/host_test/mocks/heap/CMakeLists.txt deleted file mode 100644 index 0a0c8a6..0000000 --- a/components/mqtt/host_test/mocks/heap/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -idf_component_get_property(original_heap_dir heap COMPONENT_OVERRIDEN_DIR) - -idf_component_register(SRCS heap_mock.c - INCLUDE_DIRS "${original_heap_dir}/include") diff --git a/components/mqtt/host_test/mocks/heap/heap_mock.c b/components/mqtt/host_test/mocks/heap/heap_mock.c deleted file mode 100644 index e0fc666..0000000 --- a/components/mqtt/host_test/mocks/heap/heap_mock.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#include "esp_heap_caps.h" -#include -#include - - - -void *heap_caps_calloc(size_t n, size_t size, uint32_t caps) { - (void)caps; - return calloc(n, size); - -} diff --git a/docs/en/api-reference/protocols/mqtt.rst b/docs/en/index.rst similarity index 100% rename from docs/en/api-reference/protocols/mqtt.rst rename to docs/en/index.rst diff --git a/docs/zh_CN/api-reference/protocols/mqtt.rst b/docs/zh_CN/index.rst similarity index 100% rename from docs/zh_CN/api-reference/protocols/mqtt.rst rename to docs/zh_CN/index.rst diff --git a/examples/protocols/mqtt/custom_outbox/CMakeLists.txt b/examples/custom_outbox/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/custom_outbox/CMakeLists.txt rename to examples/custom_outbox/CMakeLists.txt diff --git a/examples/protocols/mqtt/custom_outbox/README.md b/examples/custom_outbox/README.md similarity index 100% rename from examples/protocols/mqtt/custom_outbox/README.md rename to examples/custom_outbox/README.md diff --git a/examples/protocols/mqtt/custom_outbox/main/CMakeLists.txt b/examples/custom_outbox/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/custom_outbox/main/CMakeLists.txt rename to examples/custom_outbox/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/custom_outbox/main/Kconfig.projbuild b/examples/custom_outbox/main/Kconfig.projbuild similarity index 100% rename from examples/protocols/mqtt/custom_outbox/main/Kconfig.projbuild rename to examples/custom_outbox/main/Kconfig.projbuild diff --git a/examples/protocols/mqtt/custom_outbox/main/app_main.c b/examples/custom_outbox/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/custom_outbox/main/app_main.c rename to examples/custom_outbox/main/app_main.c diff --git a/examples/protocols/mqtt/custom_outbox/main/custom_outbox.cpp b/examples/custom_outbox/main/custom_outbox.cpp similarity index 100% rename from examples/protocols/mqtt/custom_outbox/main/custom_outbox.cpp rename to examples/custom_outbox/main/custom_outbox.cpp diff --git a/examples/protocols/mqtt/custom_outbox/main/idf_component.yml b/examples/custom_outbox/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/custom_outbox/main/idf_component.yml rename to examples/custom_outbox/main/idf_component.yml diff --git a/examples/protocols/mqtt/custom_outbox/sdkconfig.ci.esp32c6 b/examples/custom_outbox/sdkconfig.ci.esp32c6 similarity index 100% rename from examples/protocols/mqtt/custom_outbox/sdkconfig.ci.esp32c6 rename to examples/custom_outbox/sdkconfig.ci.esp32c6 diff --git a/examples/protocols/mqtt/custom_outbox/sdkconfig.defaults b/examples/custom_outbox/sdkconfig.defaults similarity index 100% rename from examples/protocols/mqtt/custom_outbox/sdkconfig.defaults rename to examples/custom_outbox/sdkconfig.defaults diff --git a/examples/protocols/mqtt5/CMakeLists.txt b/examples/mqtt5/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt5/CMakeLists.txt rename to examples/mqtt5/CMakeLists.txt diff --git a/examples/protocols/mqtt5/README.md b/examples/mqtt5/README.md similarity index 100% rename from examples/protocols/mqtt5/README.md rename to examples/mqtt5/README.md diff --git a/examples/protocols/mqtt/tcp/main/CMakeLists.txt b/examples/mqtt5/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/tcp/main/CMakeLists.txt rename to examples/mqtt5/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/tcp/main/Kconfig.projbuild b/examples/mqtt5/main/Kconfig.projbuild similarity index 100% rename from examples/protocols/mqtt/tcp/main/Kconfig.projbuild rename to examples/mqtt5/main/Kconfig.projbuild diff --git a/examples/protocols/mqtt5/main/app_main.c b/examples/mqtt5/main/app_main.c similarity index 100% rename from examples/protocols/mqtt5/main/app_main.c rename to examples/mqtt5/main/app_main.c diff --git a/examples/protocols/mqtt/ssl/main/idf_component.yml b/examples/mqtt5/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/ssl/main/idf_component.yml rename to examples/mqtt5/main/idf_component.yml diff --git a/examples/protocols/mqtt5/pytest_mqtt5.py b/examples/mqtt5/pytest_mqtt5.py similarity index 100% rename from examples/protocols/mqtt5/pytest_mqtt5.py rename to examples/mqtt5/pytest_mqtt5.py diff --git a/examples/protocols/mqtt5/sdkconfig.ci b/examples/mqtt5/sdkconfig.ci similarity index 100% rename from examples/protocols/mqtt5/sdkconfig.ci rename to examples/mqtt5/sdkconfig.ci diff --git a/examples/protocols/mqtt5/sdkconfig.defaults b/examples/mqtt5/sdkconfig.defaults similarity index 100% rename from examples/protocols/mqtt5/sdkconfig.defaults rename to examples/mqtt5/sdkconfig.defaults diff --git a/examples/protocols/mqtt/ssl/CMakeLists.txt b/examples/ssl/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl/CMakeLists.txt rename to examples/ssl/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl/README.md b/examples/ssl/README.md similarity index 100% rename from examples/protocols/mqtt/ssl/README.md rename to examples/ssl/README.md diff --git a/examples/protocols/mqtt/ssl/main/CMakeLists.txt b/examples/ssl/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl/main/CMakeLists.txt rename to examples/ssl/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl/main/Kconfig.projbuild b/examples/ssl/main/Kconfig.projbuild similarity index 100% rename from examples/protocols/mqtt/ssl/main/Kconfig.projbuild rename to examples/ssl/main/Kconfig.projbuild diff --git a/examples/protocols/mqtt/ssl/main/app_main.c b/examples/ssl/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/ssl/main/app_main.c rename to examples/ssl/main/app_main.c diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/idf_component.yml b/examples/ssl/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/main/idf_component.yml rename to examples/ssl/main/idf_component.yml diff --git a/examples/protocols/mqtt/ssl/main/mqtt_eclipseprojects_io.pem b/examples/ssl/main/mqtt_eclipseprojects_io.pem similarity index 100% rename from examples/protocols/mqtt/ssl/main/mqtt_eclipseprojects_io.pem rename to examples/ssl/main/mqtt_eclipseprojects_io.pem diff --git a/examples/protocols/mqtt/ssl/pytest_mqtt_ssl.py b/examples/ssl/pytest_mqtt_ssl.py similarity index 100% rename from examples/protocols/mqtt/ssl/pytest_mqtt_ssl.py rename to examples/ssl/pytest_mqtt_ssl.py diff --git a/examples/protocols/mqtt/ssl/sdkconfig.ci b/examples/ssl/sdkconfig.ci similarity index 100% rename from examples/protocols/mqtt/ssl/sdkconfig.ci rename to examples/ssl/sdkconfig.ci diff --git a/examples/protocols/mqtt/ssl_ds/CMakeLists.txt b/examples/ssl_ds/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl_ds/CMakeLists.txt rename to examples/ssl_ds/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl_ds/README.md b/examples/ssl_ds/README.md similarity index 100% rename from examples/protocols/mqtt/ssl_ds/README.md rename to examples/ssl_ds/README.md diff --git a/examples/protocols/mqtt/ssl_ds/main/CMakeLists.txt b/examples/ssl_ds/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl_ds/main/CMakeLists.txt rename to examples/ssl_ds/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl_ds/main/app_main.c b/examples/ssl_ds/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/ssl_ds/main/app_main.c rename to examples/ssl_ds/main/app_main.c diff --git a/examples/protocols/mqtt/ssl_ds/main/idf_component.yml b/examples/ssl_ds/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/ssl_ds/main/idf_component.yml rename to examples/ssl_ds/main/idf_component.yml diff --git a/examples/protocols/mqtt/ssl_ds/main/mosquitto.org.crt b/examples/ssl_ds/main/mosquitto.org.crt similarity index 100% rename from examples/protocols/mqtt/ssl_ds/main/mosquitto.org.crt rename to examples/ssl_ds/main/mosquitto.org.crt diff --git a/examples/protocols/mqtt/ssl_ds/partitions.csv b/examples/ssl_ds/partitions.csv similarity index 100% rename from examples/protocols/mqtt/ssl_ds/partitions.csv rename to examples/ssl_ds/partitions.csv diff --git a/examples/protocols/mqtt/ssl_ds/sdkconfig.defaults b/examples/ssl_ds/sdkconfig.defaults similarity index 100% rename from examples/protocols/mqtt/ssl_ds/sdkconfig.defaults rename to examples/ssl_ds/sdkconfig.defaults diff --git a/examples/protocols/mqtt/ssl_ds/sdkconfig.defaults.esp32h2 b/examples/ssl_ds/sdkconfig.defaults.esp32h2 similarity index 100% rename from examples/protocols/mqtt/ssl_ds/sdkconfig.defaults.esp32h2 rename to examples/ssl_ds/sdkconfig.defaults.esp32h2 diff --git a/examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt b/examples/ssl_mutual_auth/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt rename to examples/ssl_mutual_auth/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl_mutual_auth/README.md b/examples/ssl_mutual_auth/README.md similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/README.md rename to examples/ssl_mutual_auth/README.md diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/CMakeLists.txt b/examples/ssl_mutual_auth/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/main/CMakeLists.txt rename to examples/ssl_mutual_auth/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/app_main.c b/examples/ssl_mutual_auth/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/main/app_main.c rename to examples/ssl_mutual_auth/main/app_main.c diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/client.crt b/examples/ssl_mutual_auth/main/client.crt similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/main/client.crt rename to examples/ssl_mutual_auth/main/client.crt diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/client.key b/examples/ssl_mutual_auth/main/client.key similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/main/client.key rename to examples/ssl_mutual_auth/main/client.key diff --git a/examples/protocols/mqtt/ssl_psk/main/idf_component.yml b/examples/ssl_mutual_auth/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/ssl_psk/main/idf_component.yml rename to examples/ssl_mutual_auth/main/idf_component.yml diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/mosquitto.org.crt b/examples/ssl_mutual_auth/main/mosquitto.org.crt similarity index 100% rename from examples/protocols/mqtt/ssl_mutual_auth/main/mosquitto.org.crt rename to examples/ssl_mutual_auth/main/mosquitto.org.crt diff --git a/examples/protocols/mqtt/ssl_psk/CMakeLists.txt b/examples/ssl_psk/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl_psk/CMakeLists.txt rename to examples/ssl_psk/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl_psk/README.md b/examples/ssl_psk/README.md similarity index 100% rename from examples/protocols/mqtt/ssl_psk/README.md rename to examples/ssl_psk/README.md diff --git a/examples/protocols/mqtt/ssl_psk/main/CMakeLists.txt b/examples/ssl_psk/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ssl_psk/main/CMakeLists.txt rename to examples/ssl_psk/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/ssl_psk/main/app_main.c b/examples/ssl_psk/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/ssl_psk/main/app_main.c rename to examples/ssl_psk/main/app_main.c diff --git a/examples/protocols/mqtt/ws/main/idf_component.yml b/examples/ssl_psk/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/ws/main/idf_component.yml rename to examples/ssl_psk/main/idf_component.yml diff --git a/examples/protocols/mqtt/ssl_psk/sdkconfig.defaults b/examples/ssl_psk/sdkconfig.defaults similarity index 100% rename from examples/protocols/mqtt/ssl_psk/sdkconfig.defaults rename to examples/ssl_psk/sdkconfig.defaults diff --git a/examples/protocols/mqtt/tcp/CMakeLists.txt b/examples/tcp/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/tcp/CMakeLists.txt rename to examples/tcp/CMakeLists.txt diff --git a/examples/protocols/mqtt/tcp/README.md b/examples/tcp/README.md similarity index 100% rename from examples/protocols/mqtt/tcp/README.md rename to examples/tcp/README.md diff --git a/examples/protocols/mqtt5/main/CMakeLists.txt b/examples/tcp/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt5/main/CMakeLists.txt rename to examples/tcp/main/CMakeLists.txt diff --git a/examples/protocols/mqtt5/main/Kconfig.projbuild b/examples/tcp/main/Kconfig.projbuild similarity index 100% rename from examples/protocols/mqtt5/main/Kconfig.projbuild rename to examples/tcp/main/Kconfig.projbuild diff --git a/examples/protocols/mqtt/tcp/main/app_main.c b/examples/tcp/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/tcp/main/app_main.c rename to examples/tcp/main/app_main.c diff --git a/examples/protocols/mqtt/tcp/main/idf_component.yml b/examples/tcp/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/tcp/main/idf_component.yml rename to examples/tcp/main/idf_component.yml diff --git a/examples/protocols/mqtt/tcp/pytest_mqtt_tcp.py b/examples/tcp/pytest_mqtt_tcp.py similarity index 100% rename from examples/protocols/mqtt/tcp/pytest_mqtt_tcp.py rename to examples/tcp/pytest_mqtt_tcp.py diff --git a/examples/protocols/mqtt/tcp/sdkconfig.ci b/examples/tcp/sdkconfig.ci similarity index 100% rename from examples/protocols/mqtt/tcp/sdkconfig.ci rename to examples/tcp/sdkconfig.ci diff --git a/examples/protocols/mqtt/tcp/sdkconfig.ci.p4_eppp b/examples/tcp/sdkconfig.ci.p4_eppp similarity index 100% rename from examples/protocols/mqtt/tcp/sdkconfig.ci.p4_eppp rename to examples/tcp/sdkconfig.ci.p4_eppp diff --git a/examples/protocols/mqtt/tcp/sdkconfig.ci.p4_wifi b/examples/tcp/sdkconfig.ci.p4_wifi similarity index 100% rename from examples/protocols/mqtt/tcp/sdkconfig.ci.p4_wifi rename to examples/tcp/sdkconfig.ci.p4_wifi diff --git a/examples/protocols/mqtt/tcp/sdkconfig.ci.ppp_connect b/examples/tcp/sdkconfig.ci.ppp_connect similarity index 100% rename from examples/protocols/mqtt/tcp/sdkconfig.ci.ppp_connect rename to examples/tcp/sdkconfig.ci.ppp_connect diff --git a/examples/protocols/mqtt/ws/CMakeLists.txt b/examples/ws/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ws/CMakeLists.txt rename to examples/ws/CMakeLists.txt diff --git a/examples/protocols/mqtt/ws/README.md b/examples/ws/README.md similarity index 100% rename from examples/protocols/mqtt/ws/README.md rename to examples/ws/README.md diff --git a/examples/protocols/mqtt/ws/main/CMakeLists.txt b/examples/ws/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/ws/main/CMakeLists.txt rename to examples/ws/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/ws/main/Kconfig.projbuild b/examples/ws/main/Kconfig.projbuild similarity index 100% rename from examples/protocols/mqtt/ws/main/Kconfig.projbuild rename to examples/ws/main/Kconfig.projbuild diff --git a/examples/protocols/mqtt/ws/main/app_main.c b/examples/ws/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/ws/main/app_main.c rename to examples/ws/main/app_main.c diff --git a/examples/protocols/mqtt/wss/main/idf_component.yml b/examples/ws/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt/wss/main/idf_component.yml rename to examples/ws/main/idf_component.yml diff --git a/examples/protocols/mqtt/ws/pytest_mqtt_ws_example.py b/examples/ws/pytest_mqtt_ws_example.py similarity index 100% rename from examples/protocols/mqtt/ws/pytest_mqtt_ws_example.py rename to examples/ws/pytest_mqtt_ws_example.py diff --git a/examples/protocols/mqtt/ws/sdkconfig.ci b/examples/ws/sdkconfig.ci similarity index 100% rename from examples/protocols/mqtt/ws/sdkconfig.ci rename to examples/ws/sdkconfig.ci diff --git a/examples/protocols/mqtt/wss/CMakeLists.txt b/examples/wss/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/wss/CMakeLists.txt rename to examples/wss/CMakeLists.txt diff --git a/examples/protocols/mqtt/wss/README.md b/examples/wss/README.md similarity index 100% rename from examples/protocols/mqtt/wss/README.md rename to examples/wss/README.md diff --git a/examples/protocols/mqtt/wss/main/CMakeLists.txt b/examples/wss/main/CMakeLists.txt similarity index 100% rename from examples/protocols/mqtt/wss/main/CMakeLists.txt rename to examples/wss/main/CMakeLists.txt diff --git a/examples/protocols/mqtt/wss/main/Kconfig.projbuild b/examples/wss/main/Kconfig.projbuild similarity index 100% rename from examples/protocols/mqtt/wss/main/Kconfig.projbuild rename to examples/wss/main/Kconfig.projbuild diff --git a/examples/protocols/mqtt/wss/main/app_main.c b/examples/wss/main/app_main.c similarity index 100% rename from examples/protocols/mqtt/wss/main/app_main.c rename to examples/wss/main/app_main.c diff --git a/examples/protocols/mqtt5/main/idf_component.yml b/examples/wss/main/idf_component.yml similarity index 100% rename from examples/protocols/mqtt5/main/idf_component.yml rename to examples/wss/main/idf_component.yml diff --git a/examples/protocols/mqtt/wss/main/mqtt_eclipseprojects_io.pem b/examples/wss/main/mqtt_eclipseprojects_io.pem similarity index 100% rename from examples/protocols/mqtt/wss/main/mqtt_eclipseprojects_io.pem rename to examples/wss/main/mqtt_eclipseprojects_io.pem diff --git a/examples/protocols/mqtt/wss/pytest_mqtt_wss_example.py b/examples/wss/pytest_mqtt_wss_example.py similarity index 100% rename from examples/protocols/mqtt/wss/pytest_mqtt_wss_example.py rename to examples/wss/pytest_mqtt_wss_example.py diff --git a/examples/protocols/mqtt/wss/sdkconfig.ci b/examples/wss/sdkconfig.ci similarity index 100% rename from examples/protocols/mqtt/wss/sdkconfig.ci rename to examples/wss/sdkconfig.ci diff --git a/components/mqtt/test_apps/.build-test-rules.yml b/test/.build-test-rules.yml similarity index 100% rename from components/mqtt/test_apps/.build-test-rules.yml rename to test/.build-test-rules.yml diff --git a/tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt b/test/apps/build_test/CMakeLists.txt similarity index 100% rename from tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt rename to test/apps/build_test/CMakeLists.txt diff --git a/tools/test_apps/protocols/mqtt/build_test/README.md b/test/apps/build_test/README.md similarity index 100% rename from tools/test_apps/protocols/mqtt/build_test/README.md rename to test/apps/build_test/README.md diff --git a/tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt b/test/apps/build_test/main/CMakeLists.txt similarity index 100% rename from tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt rename to test/apps/build_test/main/CMakeLists.txt diff --git a/tools/test_apps/protocols/mqtt/build_test/main/mqtt_app.cpp b/test/apps/build_test/main/mqtt_app.cpp similarity index 100% rename from tools/test_apps/protocols/mqtt/build_test/main/mqtt_app.cpp rename to test/apps/build_test/main/mqtt_app.cpp diff --git a/components/mqtt/test_apps/common/CMakeLists.txt b/test/apps/common/CMakeLists.txt similarity index 100% rename from components/mqtt/test_apps/common/CMakeLists.txt rename to test/apps/common/CMakeLists.txt diff --git a/components/mqtt/test_apps/common/include/test_mqtt_connection.h b/test/apps/common/include/test_mqtt_connection.h similarity index 100% rename from components/mqtt/test_apps/common/include/test_mqtt_connection.h rename to test/apps/common/include/test_mqtt_connection.h diff --git a/components/mqtt/test_apps/common/test_mqtt_connection.c b/test/apps/common/test_mqtt_connection.c similarity index 100% rename from components/mqtt/test_apps/common/test_mqtt_connection.c rename to test/apps/common/test_mqtt_connection.c diff --git a/components/mqtt/test_apps/test_mqtt/CMakeLists.txt b/test/apps/mqtt/CMakeLists.txt similarity index 100% rename from components/mqtt/test_apps/test_mqtt/CMakeLists.txt rename to test/apps/mqtt/CMakeLists.txt diff --git a/components/mqtt/test_apps/test_mqtt/README.md b/test/apps/mqtt/README.md similarity index 100% rename from components/mqtt/test_apps/test_mqtt/README.md rename to test/apps/mqtt/README.md diff --git a/components/mqtt/test_apps/test_mqtt/main/CMakeLists.txt b/test/apps/mqtt/main/CMakeLists.txt similarity index 100% rename from components/mqtt/test_apps/test_mqtt/main/CMakeLists.txt rename to test/apps/mqtt/main/CMakeLists.txt diff --git a/components/mqtt/test_apps/test_mqtt/main/Kconfig.projbuild b/test/apps/mqtt/main/Kconfig.projbuild similarity index 100% rename from components/mqtt/test_apps/test_mqtt/main/Kconfig.projbuild rename to test/apps/mqtt/main/Kconfig.projbuild diff --git a/components/mqtt/test_apps/test_mqtt/main/test_mqtt.c b/test/apps/mqtt/main/test_mqtt.c similarity index 100% rename from components/mqtt/test_apps/test_mqtt/main/test_mqtt.c rename to test/apps/mqtt/main/test_mqtt.c diff --git a/components/mqtt/test_apps/test_mqtt/main/test_mqtt_client_broker.c b/test/apps/mqtt/main/test_mqtt_client_broker.c similarity index 100% rename from components/mqtt/test_apps/test_mqtt/main/test_mqtt_client_broker.c rename to test/apps/mqtt/main/test_mqtt_client_broker.c diff --git a/components/mqtt/test_apps/test_mqtt/main/test_mqtt_client_broker.h b/test/apps/mqtt/main/test_mqtt_client_broker.h similarity index 100% rename from components/mqtt/test_apps/test_mqtt/main/test_mqtt_client_broker.h rename to test/apps/mqtt/main/test_mqtt_client_broker.h diff --git a/components/mqtt/test_apps/test_mqtt/pytest_mqtt_ut.py b/test/apps/mqtt/pytest_mqtt_ut.py similarity index 100% rename from components/mqtt/test_apps/test_mqtt/pytest_mqtt_ut.py rename to test/apps/mqtt/pytest_mqtt_ut.py diff --git a/components/mqtt/test_apps/test_mqtt/sdkconfig.ci.default b/test/apps/mqtt/sdkconfig.ci.default similarity index 100% rename from components/mqtt/test_apps/test_mqtt/sdkconfig.ci.default rename to test/apps/mqtt/sdkconfig.ci.default diff --git a/components/mqtt/test_apps/test_mqtt/sdkconfig.defaults b/test/apps/mqtt/sdkconfig.defaults similarity index 100% rename from components/mqtt/test_apps/test_mqtt/sdkconfig.defaults rename to test/apps/mqtt/sdkconfig.defaults diff --git a/components/mqtt/test_apps/test_mqtt5/CMakeLists.txt b/test/apps/mqtt5/CMakeLists.txt similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/CMakeLists.txt rename to test/apps/mqtt5/CMakeLists.txt diff --git a/components/mqtt/test_apps/test_mqtt5/README.md b/test/apps/mqtt5/README.md similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/README.md rename to test/apps/mqtt5/README.md diff --git a/components/mqtt/test_apps/test_mqtt5/main/CMakeLists.txt b/test/apps/mqtt5/main/CMakeLists.txt similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/main/CMakeLists.txt rename to test/apps/mqtt5/main/CMakeLists.txt diff --git a/components/mqtt/test_apps/test_mqtt5/main/Kconfig.projbuild b/test/apps/mqtt5/main/Kconfig.projbuild similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/main/Kconfig.projbuild rename to test/apps/mqtt5/main/Kconfig.projbuild diff --git a/components/mqtt/test_apps/test_mqtt5/main/test_mqtt5.c b/test/apps/mqtt5/main/test_mqtt5.c similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/main/test_mqtt5.c rename to test/apps/mqtt5/main/test_mqtt5.c diff --git a/components/mqtt/test_apps/test_mqtt5/main/test_mqtt5_client_broker.c b/test/apps/mqtt5/main/test_mqtt5_client_broker.c similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/main/test_mqtt5_client_broker.c rename to test/apps/mqtt5/main/test_mqtt5_client_broker.c diff --git a/components/mqtt/test_apps/test_mqtt5/main/test_mqtt5_client_broker.h b/test/apps/mqtt5/main/test_mqtt5_client_broker.h similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/main/test_mqtt5_client_broker.h rename to test/apps/mqtt5/main/test_mqtt5_client_broker.h diff --git a/components/mqtt/test_apps/test_mqtt5/pytest_mqtt5_ut.py b/test/apps/mqtt5/pytest_mqtt5_ut.py similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/pytest_mqtt5_ut.py rename to test/apps/mqtt5/pytest_mqtt5_ut.py diff --git a/components/mqtt/test_apps/test_mqtt5/sdkconfig.ci.default b/test/apps/mqtt5/sdkconfig.ci.default similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/sdkconfig.ci.default rename to test/apps/mqtt5/sdkconfig.ci.default diff --git a/components/mqtt/test_apps/test_mqtt5/sdkconfig.defaults b/test/apps/mqtt5/sdkconfig.defaults similarity index 100% rename from components/mqtt/test_apps/test_mqtt5/sdkconfig.defaults rename to test/apps/mqtt5/sdkconfig.defaults diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/CMakeLists.txt b/test/apps/publish_connect_test/CMakeLists.txt similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/CMakeLists.txt rename to test/apps/publish_connect_test/CMakeLists.txt diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/README.md b/test/apps/publish_connect_test/README.md similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/README.md rename to test/apps/publish_connect_test/README.md diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.crt b/test/apps/publish_connect_test/ca.crt similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/ca.crt rename to test/apps/publish_connect_test/ca.crt diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.der b/test/apps/publish_connect_test/ca.der similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/ca.der rename to test/apps/publish_connect_test/ca.der diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.key b/test/apps/publish_connect_test/ca.key similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/ca.key rename to test/apps/publish_connect_test/ca.key diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_inv.crt b/test/apps/publish_connect_test/client_inv.crt similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/client_inv.crt rename to test/apps/publish_connect_test/client_inv.crt diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_no_pwd.key b/test/apps/publish_connect_test/client_no_pwd.key similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/client_no_pwd.key rename to test/apps/publish_connect_test/client_no_pwd.key diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.crt b/test/apps/publish_connect_test/client_pwd.crt similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.crt rename to test/apps/publish_connect_test/client_pwd.crt diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.key b/test/apps/publish_connect_test/client_pwd.key similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.key rename to test/apps/publish_connect_test/client_pwd.key diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/CMakeLists.txt b/test/apps/publish_connect_test/main/CMakeLists.txt similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/CMakeLists.txt rename to test/apps/publish_connect_test/main/CMakeLists.txt diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/Kconfig.projbuild b/test/apps/publish_connect_test/main/Kconfig.projbuild similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/Kconfig.projbuild rename to test/apps/publish_connect_test/main/Kconfig.projbuild diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/connect_test.c b/test/apps/publish_connect_test/main/connect_test.c similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/connect_test.c rename to test/apps/publish_connect_test/main/connect_test.c diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/idf_component.yml b/test/apps/publish_connect_test/main/idf_component.yml similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/idf_component.yml rename to test/apps/publish_connect_test/main/idf_component.yml diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/mqtt_eclipseprojects_io.pem b/test/apps/publish_connect_test/main/mqtt_eclipseprojects_io.pem similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/mqtt_eclipseprojects_io.pem rename to test/apps/publish_connect_test/main/mqtt_eclipseprojects_io.pem diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_connect_test.c b/test/apps/publish_connect_test/main/publish_connect_test.c similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_connect_test.c rename to test/apps/publish_connect_test/main/publish_connect_test.c diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_connect_test.h b/test/apps/publish_connect_test/main/publish_connect_test.h similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_connect_test.h rename to test/apps/publish_connect_test/main/publish_connect_test.h diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c b/test/apps/publish_connect_test/main/publish_test.c similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c rename to test/apps/publish_connect_test/main/publish_test.c diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/pytest_mqtt_app.py b/test/apps/publish_connect_test/pytest_mqtt_app.py similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/pytest_mqtt_app.py rename to test/apps/publish_connect_test/pytest_mqtt_app.py diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/pytest_mqtt_publish_app.py b/test/apps/publish_connect_test/pytest_mqtt_publish_app.py similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/pytest_mqtt_publish_app.py rename to test/apps/publish_connect_test/pytest_mqtt_publish_app.py diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/sdkconfig.ci.default b/test/apps/publish_connect_test/sdkconfig.ci.default similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/sdkconfig.ci.default rename to test/apps/publish_connect_test/sdkconfig.ci.default diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/sdkconfig.ci.local_broker b/test/apps/publish_connect_test/sdkconfig.ci.local_broker similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/sdkconfig.ci.local_broker rename to test/apps/publish_connect_test/sdkconfig.ci.local_broker diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/sdkconfig.qemu b/test/apps/publish_connect_test/sdkconfig.qemu similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/sdkconfig.qemu rename to test/apps/publish_connect_test/sdkconfig.qemu diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/server.key b/test/apps/publish_connect_test/server.key similarity index 100% rename from tools/test_apps/protocols/mqtt/publish_connect_test/server.key rename to test/apps/publish_connect_test/server.key diff --git a/host_test/CMakeLists.txt b/test/host/CMakeLists.txt similarity index 100% rename from host_test/CMakeLists.txt rename to test/host/CMakeLists.txt diff --git a/host_test/README.md b/test/host/README.md similarity index 100% rename from host_test/README.md rename to test/host/README.md diff --git a/host_test/main/CMakeLists.txt b/test/host/main/CMakeLists.txt similarity index 100% rename from host_test/main/CMakeLists.txt rename to test/host/main/CMakeLists.txt diff --git a/host_test/main/Kconfig b/test/host/main/Kconfig similarity index 100% rename from host_test/main/Kconfig rename to test/host/main/Kconfig diff --git a/host_test/main/idf_component.yml b/test/host/main/idf_component.yml similarity index 100% rename from host_test/main/idf_component.yml rename to test/host/main/idf_component.yml diff --git a/host_test/main/test_mqtt_client.cpp b/test/host/main/test_mqtt_client.cpp similarity index 100% rename from host_test/main/test_mqtt_client.cpp rename to test/host/main/test_mqtt_client.cpp diff --git a/host_test/mocks/include/sys/queue.h b/test/host/mocks/include/sys/queue.h similarity index 100% rename from host_test/mocks/include/sys/queue.h rename to test/host/mocks/include/sys/queue.h diff --git a/host_test/sdkconfig.ci.coverage b/test/host/sdkconfig.ci.coverage similarity index 100% rename from host_test/sdkconfig.ci.coverage rename to test/host/sdkconfig.ci.coverage diff --git a/host_test/sdkconfig.defaults b/test/host/sdkconfig.defaults similarity index 100% rename from host_test/sdkconfig.defaults rename to test/host/sdkconfig.defaults