From c136089f4e0b27d9f034175579379e8f208ac869 Mon Sep 17 00:00:00 2001 From: Wang Mengyang Date: Fri, 29 Mar 2024 12:30:45 +0800 Subject: [PATCH] change(bt): Modify test_app directory layout - Existing test app is put in a new subdirectory "basic_unit_test" --- components/bt/test_apps/.build-test-rules.yml | 2 +- components/bt/test_apps/{ => basic_unit_test}/CMakeLists.txt | 0 components/bt/test_apps/{ => basic_unit_test}/README.md | 0 .../bt/test_apps/{ => basic_unit_test}/main/CMakeLists.txt | 0 .../bt/test_apps/{ => basic_unit_test}/main/test_bt_common.c | 0 .../bt/test_apps/{ => basic_unit_test}/main/test_bt_main.c | 0 components/bt/test_apps/{ => basic_unit_test}/main/test_smp.c | 0 .../pytest_basic_unit_test.py} | 3 +-- .../bt/test_apps/{ => basic_unit_test}/sdkconfig.defaults | 1 - 9 files changed, 2 insertions(+), 4 deletions(-) rename components/bt/test_apps/{ => basic_unit_test}/CMakeLists.txt (100%) rename components/bt/test_apps/{ => basic_unit_test}/README.md (100%) rename components/bt/test_apps/{ => basic_unit_test}/main/CMakeLists.txt (100%) rename components/bt/test_apps/{ => basic_unit_test}/main/test_bt_common.c (100%) rename components/bt/test_apps/{ => basic_unit_test}/main/test_bt_main.c (100%) rename components/bt/test_apps/{ => basic_unit_test}/main/test_smp.c (100%) rename components/bt/test_apps/{pytest_bt.py => basic_unit_test/pytest_basic_unit_test.py} (77%) rename components/bt/test_apps/{ => basic_unit_test}/sdkconfig.defaults (61%) diff --git a/components/bt/test_apps/.build-test-rules.yml b/components/bt/test_apps/.build-test-rules.yml index f96777d2da..72899ce198 100644 --- a/components/bt/test_apps/.build-test-rules.yml +++ b/components/bt/test_apps/.build-test-rules.yml @@ -1,6 +1,6 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/bt/test_apps: +components/bt/test_apps/basic_unit_test: disable: - if: IDF_TARGET not in ["esp32", "esp32c3"] reason: Sufficient to run the tests on one chip of each architecture diff --git a/components/bt/test_apps/CMakeLists.txt b/components/bt/test_apps/basic_unit_test/CMakeLists.txt similarity index 100% rename from components/bt/test_apps/CMakeLists.txt rename to components/bt/test_apps/basic_unit_test/CMakeLists.txt diff --git a/components/bt/test_apps/README.md b/components/bt/test_apps/basic_unit_test/README.md similarity index 100% rename from components/bt/test_apps/README.md rename to components/bt/test_apps/basic_unit_test/README.md diff --git a/components/bt/test_apps/main/CMakeLists.txt b/components/bt/test_apps/basic_unit_test/main/CMakeLists.txt similarity index 100% rename from components/bt/test_apps/main/CMakeLists.txt rename to components/bt/test_apps/basic_unit_test/main/CMakeLists.txt diff --git a/components/bt/test_apps/main/test_bt_common.c b/components/bt/test_apps/basic_unit_test/main/test_bt_common.c similarity index 100% rename from components/bt/test_apps/main/test_bt_common.c rename to components/bt/test_apps/basic_unit_test/main/test_bt_common.c diff --git a/components/bt/test_apps/main/test_bt_main.c b/components/bt/test_apps/basic_unit_test/main/test_bt_main.c similarity index 100% rename from components/bt/test_apps/main/test_bt_main.c rename to components/bt/test_apps/basic_unit_test/main/test_bt_main.c diff --git a/components/bt/test_apps/main/test_smp.c b/components/bt/test_apps/basic_unit_test/main/test_smp.c similarity index 100% rename from components/bt/test_apps/main/test_smp.c rename to components/bt/test_apps/basic_unit_test/main/test_smp.c diff --git a/components/bt/test_apps/pytest_bt.py b/components/bt/test_apps/basic_unit_test/pytest_basic_unit_test.py similarity index 77% rename from components/bt/test_apps/pytest_bt.py rename to components/bt/test_apps/basic_unit_test/pytest_basic_unit_test.py index 74b0a76afc..de3d235bb5 100644 --- a/components/bt/test_apps/pytest_bt.py +++ b/components/bt/test_apps/basic_unit_test/pytest_basic_unit_test.py @@ -1,6 +1,5 @@ -# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 - import pytest from pytest_embedded import Dut diff --git a/components/bt/test_apps/sdkconfig.defaults b/components/bt/test_apps/basic_unit_test/sdkconfig.defaults similarity index 61% rename from components/bt/test_apps/sdkconfig.defaults rename to components/bt/test_apps/basic_unit_test/sdkconfig.defaults index 5847dd3c63..dc2d7ca08b 100644 --- a/components/bt/test_apps/sdkconfig.defaults +++ b/components/bt/test_apps/basic_unit_test/sdkconfig.defaults @@ -1,3 +1,2 @@ CONFIG_BT_ENABLED=y -CONFIG_UNITY_FREERTOS_STACK_SIZE=12288 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n