From 914bb81b9510fe0ce1d8107c25a59ff3774d9280 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 27 Mar 2023 17:41:44 +0800 Subject: [PATCH] ci: move linux host tests to test app folder --- components/esp_hw_support/.build-test-rules.yml | 7 +++---- .../esp_hw_support_unity_tests/pytest_esp_hw_support.py | 4 +--- .../host_test_linux/CMakeLists.txt | 0 .../{host_test => test_apps}/host_test_linux/README.md | 0 .../host_test_linux/main/CMakeLists.txt | 0 .../host_test_linux/main/test_hw_support_linux.c | 2 +- .../host_test_linux/pytest_esp_hw_support_linux.py | 4 +--- .../host_test_linux/sdkconfig.defaults | 0 .../esp_hw_support_unity_tests/pytest_security_support.py | 4 +--- components/esp_rom/.build-test-rules.yml | 8 +------- .../rom_test => test_apps/linux_rom_apis}/CMakeLists.txt | 0 .../rom_test => test_apps/linux_rom_apis}/README.md | 0 .../linux_rom_apis}/main/CMakeLists.txt | 0 .../linux_rom_apis}/main/rom_test.cpp | 5 +++++ .../linux_rom_apis}/pytest_esp_rom_linux.py | 0 .../linux_rom_apis}/sdkconfig.defaults | 0 .../test_apps/{ => rom_unity_tests}/CMakeLists.txt | 0 .../esp_rom/test_apps/{ => rom_unity_tests}/README.md | 0 .../test_apps/{ => rom_unity_tests}/main/CMakeLists.txt | 0 .../test_apps/{ => rom_unity_tests}/main/test_app_main.c | 2 +- .../test_apps/{ => rom_unity_tests}/main/test_libgcc.c | 2 +- .../test_apps/{ => rom_unity_tests}/main/test_miniz.c | 2 +- .../test_apps/{ => rom_unity_tests}/pytest_esp_rom.py | 0 .../test_apps/{ => rom_unity_tests}/sdkconfig.defaults | 0 components/esp_system/.build-test-rules.yml | 2 +- .../linux_apis}/CMakeLists.txt | 0 .../test_esp_system => test_apps/linux_apis}/README.md | 0 .../linux_apis}/main/CMakeLists.txt | 0 .../linux_apis}/main/esp_system_test.c | 2 +- .../linux_apis}/pytest_esp_system_linux.py | 4 +--- .../linux_apis}/sdkconfig.defaults | 0 components/heap/.build-test-rules.yml | 2 +- .../host_test_linux/CMakeLists.txt | 0 .../{host_test => test_apps}/host_test_linux/README.md | 0 .../host_test_linux/main/CMakeLists.txt | 0 .../host_test_linux/main/test_heap_linux.c | 2 +- .../host_test_linux/pytest_heap_linux.py | 4 +--- .../host_test_linux/sdkconfig.defaults | 0 .../heap/test_apps/{ => unity_rom_tests}/CMakeLists.txt | 0 components/heap/test_apps/{ => unity_rom_tests}/README.md | 0 .../test_apps/{ => unity_rom_tests}/main/CMakeLists.txt | 0 .../{ => unity_rom_tests}/main/test_aligned_alloc_caps.c | 2 +- .../{ => unity_rom_tests}/main/test_allocator_timings.c | 2 +- .../{ => unity_rom_tests}/main/test_corruption_check.c | 2 +- .../test_apps/{ => unity_rom_tests}/main/test_diram.c | 0 .../test_apps/{ => unity_rom_tests}/main/test_heap_main.c | 0 .../{ => unity_rom_tests}/main/test_heap_trace.c | 0 .../test_apps/{ => unity_rom_tests}/main/test_malloc.c | 0 .../{ => unity_rom_tests}/main/test_malloc_caps.c | 0 .../test_apps/{ => unity_rom_tests}/main/test_realloc.c | 0 .../{ => unity_rom_tests}/main/test_runtime_heap_reg.c | 2 +- .../heap/test_apps/{ => unity_rom_tests}/pytest_heap.py | 0 .../{ => unity_rom_tests}/sdkconfig.ci.8bit_access | 0 .../{ => unity_rom_tests}/sdkconfig.ci.abort_alloc_fail | 0 .../sdkconfig.ci.comprehensive_poisoning | 0 .../{ => unity_rom_tests}/sdkconfig.ci.func_hooks | 0 .../{ => unity_rom_tests}/sdkconfig.ci.heap_trace | 0 .../{ => unity_rom_tests}/sdkconfig.ci.light_poisoning | 0 .../test_apps/{ => unity_rom_tests}/sdkconfig.ci.mem_prot | 0 .../{ => unity_rom_tests}/sdkconfig.ci.no_poisoning | 0 .../test_apps/{ => unity_rom_tests}/sdkconfig.ci.psram | 0 .../{ => unity_rom_tests}/sdkconfig.ci.psram_all_ext | 0 .../test_apps/{ => unity_rom_tests}/sdkconfig.defaults | 0 63 files changed, 26 insertions(+), 38 deletions(-) rename components/esp_hw_support/{host_test => test_apps}/host_test_linux/CMakeLists.txt (100%) rename components/esp_hw_support/{host_test => test_apps}/host_test_linux/README.md (100%) rename components/esp_hw_support/{host_test => test_apps}/host_test_linux/main/CMakeLists.txt (100%) rename components/esp_hw_support/{host_test => test_apps}/host_test_linux/main/test_hw_support_linux.c (96%) rename components/esp_hw_support/{host_test => test_apps}/host_test_linux/pytest_esp_hw_support_linux.py (67%) rename components/esp_hw_support/{host_test => test_apps}/host_test_linux/sdkconfig.defaults (100%) rename components/esp_rom/{host_test/rom_test => test_apps/linux_rom_apis}/CMakeLists.txt (100%) rename components/esp_rom/{host_test/rom_test => test_apps/linux_rom_apis}/README.md (100%) rename components/esp_rom/{host_test/rom_test => test_apps/linux_rom_apis}/main/CMakeLists.txt (100%) rename components/esp_rom/{host_test/rom_test => test_apps/linux_rom_apis}/main/rom_test.cpp (95%) rename components/esp_rom/{host_test/rom_test => test_apps/linux_rom_apis}/pytest_esp_rom_linux.py (100%) rename components/esp_rom/{host_test/rom_test => test_apps/linux_rom_apis}/sdkconfig.defaults (100%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/CMakeLists.txt (100%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/README.md (100%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/main/CMakeLists.txt (100%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/main/test_app_main.c (93%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/main/test_libgcc.c (99%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/main/test_miniz.c (97%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/pytest_esp_rom.py (100%) rename components/esp_rom/test_apps/{ => rom_unity_tests}/sdkconfig.defaults (100%) rename components/esp_system/{host_test/test_esp_system => test_apps/linux_apis}/CMakeLists.txt (100%) rename components/esp_system/{host_test/test_esp_system => test_apps/linux_apis}/README.md (100%) rename components/esp_system/{host_test/test_esp_system => test_apps/linux_apis}/main/CMakeLists.txt (100%) rename components/esp_system/{host_test/test_esp_system => test_apps/linux_apis}/main/esp_system_test.c (97%) rename components/esp_system/{host_test/test_esp_system => test_apps/linux_apis}/pytest_esp_system_linux.py (66%) rename components/esp_system/{host_test/test_esp_system => test_apps/linux_apis}/sdkconfig.defaults (100%) rename components/heap/{host_test => test_apps}/host_test_linux/CMakeLists.txt (100%) rename components/heap/{host_test => test_apps}/host_test_linux/README.md (100%) rename components/heap/{host_test => test_apps}/host_test_linux/main/CMakeLists.txt (100%) rename components/heap/{host_test => test_apps}/host_test_linux/main/test_heap_linux.c (97%) rename components/heap/{host_test => test_apps}/host_test_linux/pytest_heap_linux.py (65%) rename components/heap/{host_test => test_apps}/host_test_linux/sdkconfig.defaults (100%) rename components/heap/test_apps/{ => unity_rom_tests}/CMakeLists.txt (100%) rename components/heap/test_apps/{ => unity_rom_tests}/README.md (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/CMakeLists.txt (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_aligned_alloc_caps.c (98%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_allocator_timings.c (98%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_corruption_check.c (97%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_diram.c (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_heap_main.c (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_heap_trace.c (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_malloc.c (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_malloc_caps.c (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_realloc.c (100%) rename components/heap/test_apps/{ => unity_rom_tests}/main/test_runtime_heap_reg.c (98%) rename components/heap/test_apps/{ => unity_rom_tests}/pytest_heap.py (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.8bit_access (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.abort_alloc_fail (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.comprehensive_poisoning (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.func_hooks (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.heap_trace (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.light_poisoning (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.mem_prot (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.no_poisoning (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.psram (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.ci.psram_all_ext (100%) rename components/heap/test_apps/{ => unity_rom_tests}/sdkconfig.defaults (100%) diff --git a/components/esp_hw_support/.build-test-rules.yml b/components/esp_hw_support/.build-test-rules.yml index 8cb88ea760..cd908eff9f 100644 --- a/components/esp_hw_support/.build-test-rules.yml +++ b/components/esp_hw_support/.build-test-rules.yml @@ -14,6 +14,9 @@ components/esp_hw_support/test_apps/etm: disable: - if: SOC_ETM_SUPPORTED != 1 +components/esp_hw_support/test_apps/host_test_linux: + enable: + - if: IDF_TARGET == "linux" components/esp_hw_support/test_apps/mspi: disable: - if: IDF_TARGET != "esp32s3" @@ -29,7 +32,3 @@ components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests: - if: IDF_TARGET in ["esp32h2"] temporary: true reason: H2 fails IDF-6898 - -components/heap/host_test/host_test_linux: - enable: - - if: IDF_TARGET == "linux" diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py index b486891bdf..e755803425 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py @@ -16,6 +16,4 @@ from pytest_embedded import Dut indirect=True, ) def test_esp_hw_support(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('![ignore]') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) diff --git a/components/esp_hw_support/host_test/host_test_linux/CMakeLists.txt b/components/esp_hw_support/test_apps/host_test_linux/CMakeLists.txt similarity index 100% rename from components/esp_hw_support/host_test/host_test_linux/CMakeLists.txt rename to components/esp_hw_support/test_apps/host_test_linux/CMakeLists.txt diff --git a/components/esp_hw_support/host_test/host_test_linux/README.md b/components/esp_hw_support/test_apps/host_test_linux/README.md similarity index 100% rename from components/esp_hw_support/host_test/host_test_linux/README.md rename to components/esp_hw_support/test_apps/host_test_linux/README.md diff --git a/components/esp_hw_support/host_test/host_test_linux/main/CMakeLists.txt b/components/esp_hw_support/test_apps/host_test_linux/main/CMakeLists.txt similarity index 100% rename from components/esp_hw_support/host_test/host_test_linux/main/CMakeLists.txt rename to components/esp_hw_support/test_apps/host_test_linux/main/CMakeLists.txt diff --git a/components/esp_hw_support/host_test/host_test_linux/main/test_hw_support_linux.c b/components/esp_hw_support/test_apps/host_test_linux/main/test_hw_support_linux.c similarity index 96% rename from components/esp_hw_support/host_test/host_test_linux/main/test_hw_support_linux.c rename to components/esp_hw_support/test_apps/host_test_linux/main/test_hw_support_linux.c index d581b3532b..eeaef0966c 100644 --- a/components/esp_hw_support/host_test/host_test_linux/main/test_hw_support_linux.c +++ b/components/esp_hw_support/test_apps/host_test_linux/main/test_hw_support_linux.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/host_test/host_test_linux/pytest_esp_hw_support_linux.py b/components/esp_hw_support/test_apps/host_test_linux/pytest_esp_hw_support_linux.py similarity index 67% rename from components/esp_hw_support/host_test/host_test_linux/pytest_esp_hw_support_linux.py rename to components/esp_hw_support/test_apps/host_test_linux/pytest_esp_hw_support_linux.py index e29da5c94e..1f8570d3c4 100644 --- a/components/esp_hw_support/host_test/host_test_linux/pytest_esp_hw_support_linux.py +++ b/components/esp_hw_support/test_apps/host_test_linux/pytest_esp_hw_support_linux.py @@ -7,6 +7,4 @@ from pytest_embedded import Dut @pytest.mark.linux @pytest.mark.host_test def test_esp_hw_support_linux(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests.') - dut.write('*') - dut.expect_unity_test_output(timeout=5) + dut.run_all_single_board_cases() diff --git a/components/esp_hw_support/host_test/host_test_linux/sdkconfig.defaults b/components/esp_hw_support/test_apps/host_test_linux/sdkconfig.defaults similarity index 100% rename from components/esp_hw_support/host_test/host_test_linux/sdkconfig.defaults rename to components/esp_hw_support/test_apps/host_test_linux/sdkconfig.defaults diff --git a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/pytest_security_support.py b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/pytest_security_support.py index f28e7db43b..3d27fb1ad9 100644 --- a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/pytest_security_support.py +++ b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/pytest_security_support.py @@ -15,6 +15,4 @@ from pytest_embedded import Dut indirect=True, ) def test_security_support(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('![ignore]') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) diff --git a/components/esp_rom/.build-test-rules.yml b/components/esp_rom/.build-test-rules.yml index 8a19709b18..ebf8b3ecdb 100644 --- a/components/esp_rom/.build-test-rules.yml +++ b/components/esp_rom/.build-test-rules.yml @@ -1,12 +1,6 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/esp_rom/host_test/rom_test: +components/esp_rom/test_apps/linux_rom_apis: enable: - if: IDF_TARGET == "linux" reason: only test on linux - -components/esp_rom/test_apps: - disable_test: - - if: IDF_TARGET in ["esp32", "esp32c2"] - temporary: false - reason: lack of memory for testing miniz compressing diff --git a/components/esp_rom/host_test/rom_test/CMakeLists.txt b/components/esp_rom/test_apps/linux_rom_apis/CMakeLists.txt similarity index 100% rename from components/esp_rom/host_test/rom_test/CMakeLists.txt rename to components/esp_rom/test_apps/linux_rom_apis/CMakeLists.txt diff --git a/components/esp_rom/host_test/rom_test/README.md b/components/esp_rom/test_apps/linux_rom_apis/README.md similarity index 100% rename from components/esp_rom/host_test/rom_test/README.md rename to components/esp_rom/test_apps/linux_rom_apis/README.md diff --git a/components/esp_rom/host_test/rom_test/main/CMakeLists.txt b/components/esp_rom/test_apps/linux_rom_apis/main/CMakeLists.txt similarity index 100% rename from components/esp_rom/host_test/rom_test/main/CMakeLists.txt rename to components/esp_rom/test_apps/linux_rom_apis/main/CMakeLists.txt diff --git a/components/esp_rom/host_test/rom_test/main/rom_test.cpp b/components/esp_rom/test_apps/linux_rom_apis/main/rom_test.cpp similarity index 95% rename from components/esp_rom/host_test/rom_test/main/rom_test.cpp rename to components/esp_rom/test_apps/linux_rom_apis/main/rom_test.cpp index 3b9bd6a9d9..664f8a6548 100644 --- a/components/esp_rom/host_test/rom_test/main/rom_test.cpp +++ b/components/esp_rom/test_apps/linux_rom_apis/main/rom_test.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ /* LOG unit tests This example code is in the Public Domain (or CC0 licensed, at your option.) diff --git a/components/esp_rom/host_test/rom_test/pytest_esp_rom_linux.py b/components/esp_rom/test_apps/linux_rom_apis/pytest_esp_rom_linux.py similarity index 100% rename from components/esp_rom/host_test/rom_test/pytest_esp_rom_linux.py rename to components/esp_rom/test_apps/linux_rom_apis/pytest_esp_rom_linux.py diff --git a/components/esp_rom/host_test/rom_test/sdkconfig.defaults b/components/esp_rom/test_apps/linux_rom_apis/sdkconfig.defaults similarity index 100% rename from components/esp_rom/host_test/rom_test/sdkconfig.defaults rename to components/esp_rom/test_apps/linux_rom_apis/sdkconfig.defaults diff --git a/components/esp_rom/test_apps/CMakeLists.txt b/components/esp_rom/test_apps/rom_unity_tests/CMakeLists.txt similarity index 100% rename from components/esp_rom/test_apps/CMakeLists.txt rename to components/esp_rom/test_apps/rom_unity_tests/CMakeLists.txt diff --git a/components/esp_rom/test_apps/README.md b/components/esp_rom/test_apps/rom_unity_tests/README.md similarity index 100% rename from components/esp_rom/test_apps/README.md rename to components/esp_rom/test_apps/rom_unity_tests/README.md diff --git a/components/esp_rom/test_apps/main/CMakeLists.txt b/components/esp_rom/test_apps/rom_unity_tests/main/CMakeLists.txt similarity index 100% rename from components/esp_rom/test_apps/main/CMakeLists.txt rename to components/esp_rom/test_apps/rom_unity_tests/main/CMakeLists.txt diff --git a/components/esp_rom/test_apps/main/test_app_main.c b/components/esp_rom/test_apps/rom_unity_tests/main/test_app_main.c similarity index 93% rename from components/esp_rom/test_apps/main/test_app_main.c rename to components/esp_rom/test_apps/rom_unity_tests/main/test_app_main.c index f739ea079f..20ce674a19 100644 --- a/components/esp_rom/test_apps/main/test_app_main.c +++ b/components/esp_rom/test_apps/rom_unity_tests/main/test_app_main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/esp_rom/test_apps/main/test_libgcc.c b/components/esp_rom/test_apps/rom_unity_tests/main/test_libgcc.c similarity index 99% rename from components/esp_rom/test_apps/main/test_libgcc.c rename to components/esp_rom/test_apps/rom_unity_tests/main/test_libgcc.c index d3b84a876f..438b1027ab 100644 --- a/components/esp_rom/test_apps/main/test_libgcc.c +++ b/components/esp_rom/test_apps/rom_unity_tests/main/test_libgcc.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/esp_rom/test_apps/main/test_miniz.c b/components/esp_rom/test_apps/rom_unity_tests/main/test_miniz.c similarity index 97% rename from components/esp_rom/test_apps/main/test_miniz.c rename to components/esp_rom/test_apps/rom_unity_tests/main/test_miniz.c index 96828224f7..3cc0775a3e 100644 --- a/components/esp_rom/test_apps/main/test_miniz.c +++ b/components/esp_rom/test_apps/rom_unity_tests/main/test_miniz.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/esp_rom/test_apps/pytest_esp_rom.py b/components/esp_rom/test_apps/rom_unity_tests/pytest_esp_rom.py similarity index 100% rename from components/esp_rom/test_apps/pytest_esp_rom.py rename to components/esp_rom/test_apps/rom_unity_tests/pytest_esp_rom.py diff --git a/components/esp_rom/test_apps/sdkconfig.defaults b/components/esp_rom/test_apps/rom_unity_tests/sdkconfig.defaults similarity index 100% rename from components/esp_rom/test_apps/sdkconfig.defaults rename to components/esp_rom/test_apps/rom_unity_tests/sdkconfig.defaults diff --git a/components/esp_system/.build-test-rules.yml b/components/esp_system/.build-test-rules.yml index 468b2d0eac..913514beca 100644 --- a/components/esp_system/.build-test-rules.yml +++ b/components/esp_system/.build-test-rules.yml @@ -1,6 +1,6 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/esp_system/host_test/esp_system: +components/esp_system/test_apps/linux_apis: enable: - if: IDF_TARGET == "linux" diff --git a/components/esp_system/host_test/test_esp_system/CMakeLists.txt b/components/esp_system/test_apps/linux_apis/CMakeLists.txt similarity index 100% rename from components/esp_system/host_test/test_esp_system/CMakeLists.txt rename to components/esp_system/test_apps/linux_apis/CMakeLists.txt diff --git a/components/esp_system/host_test/test_esp_system/README.md b/components/esp_system/test_apps/linux_apis/README.md similarity index 100% rename from components/esp_system/host_test/test_esp_system/README.md rename to components/esp_system/test_apps/linux_apis/README.md diff --git a/components/esp_system/host_test/test_esp_system/main/CMakeLists.txt b/components/esp_system/test_apps/linux_apis/main/CMakeLists.txt similarity index 100% rename from components/esp_system/host_test/test_esp_system/main/CMakeLists.txt rename to components/esp_system/test_apps/linux_apis/main/CMakeLists.txt diff --git a/components/esp_system/host_test/test_esp_system/main/esp_system_test.c b/components/esp_system/test_apps/linux_apis/main/esp_system_test.c similarity index 97% rename from components/esp_system/host_test/test_esp_system/main/esp_system_test.c rename to components/esp_system/test_apps/linux_apis/main/esp_system_test.c index 3d123c2602..4e6755a02c 100644 --- a/components/esp_system/host_test/test_esp_system/main/esp_system_test.c +++ b/components/esp_system/test_apps/linux_apis/main/esp_system_test.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_system/host_test/test_esp_system/pytest_esp_system_linux.py b/components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py similarity index 66% rename from components/esp_system/host_test/test_esp_system/pytest_esp_system_linux.py rename to components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py index 7b065ec65e..2fec00e91a 100644 --- a/components/esp_system/host_test/test_esp_system/pytest_esp_system_linux.py +++ b/components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py @@ -7,6 +7,4 @@ from pytest_embedded import Dut @pytest.mark.linux @pytest.mark.host_test def test_esp_system_linux(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests.') - dut.write('*') - dut.expect_unity_test_output(timeout=10) + dut.run_all_single_board_cases() diff --git a/components/esp_system/host_test/test_esp_system/sdkconfig.defaults b/components/esp_system/test_apps/linux_apis/sdkconfig.defaults similarity index 100% rename from components/esp_system/host_test/test_esp_system/sdkconfig.defaults rename to components/esp_system/test_apps/linux_apis/sdkconfig.defaults diff --git a/components/heap/.build-test-rules.yml b/components/heap/.build-test-rules.yml index ee02ab85e3..856c56efde 100644 --- a/components/heap/.build-test-rules.yml +++ b/components/heap/.build-test-rules.yml @@ -1,5 +1,5 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/heap/host_test/host_test_linux: +components/heap/test_apps/host_test_linux: enable: - if: IDF_TARGET == "linux" diff --git a/components/heap/host_test/host_test_linux/CMakeLists.txt b/components/heap/test_apps/host_test_linux/CMakeLists.txt similarity index 100% rename from components/heap/host_test/host_test_linux/CMakeLists.txt rename to components/heap/test_apps/host_test_linux/CMakeLists.txt diff --git a/components/heap/host_test/host_test_linux/README.md b/components/heap/test_apps/host_test_linux/README.md similarity index 100% rename from components/heap/host_test/host_test_linux/README.md rename to components/heap/test_apps/host_test_linux/README.md diff --git a/components/heap/host_test/host_test_linux/main/CMakeLists.txt b/components/heap/test_apps/host_test_linux/main/CMakeLists.txt similarity index 100% rename from components/heap/host_test/host_test_linux/main/CMakeLists.txt rename to components/heap/test_apps/host_test_linux/main/CMakeLists.txt diff --git a/components/heap/host_test/host_test_linux/main/test_heap_linux.c b/components/heap/test_apps/host_test_linux/main/test_heap_linux.c similarity index 97% rename from components/heap/host_test/host_test_linux/main/test_heap_linux.c rename to components/heap/test_apps/host_test_linux/main/test_heap_linux.c index b17a45518d..8256993258 100644 --- a/components/heap/host_test/host_test_linux/main/test_heap_linux.c +++ b/components/heap/test_apps/host_test_linux/main/test_heap_linux.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/heap/host_test/host_test_linux/pytest_heap_linux.py b/components/heap/test_apps/host_test_linux/pytest_heap_linux.py similarity index 65% rename from components/heap/host_test/host_test_linux/pytest_heap_linux.py rename to components/heap/test_apps/host_test_linux/pytest_heap_linux.py index 6ae0bf382f..a4cdd5b875 100644 --- a/components/heap/host_test/host_test_linux/pytest_heap_linux.py +++ b/components/heap/test_apps/host_test_linux/pytest_heap_linux.py @@ -7,6 +7,4 @@ from pytest_embedded import Dut @pytest.mark.linux @pytest.mark.host_test def test_heap_linux(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests.') - dut.write('*') - dut.expect_unity_test_output(timeout=10) + dut.run_all_single_board_cases() diff --git a/components/heap/host_test/host_test_linux/sdkconfig.defaults b/components/heap/test_apps/host_test_linux/sdkconfig.defaults similarity index 100% rename from components/heap/host_test/host_test_linux/sdkconfig.defaults rename to components/heap/test_apps/host_test_linux/sdkconfig.defaults diff --git a/components/heap/test_apps/CMakeLists.txt b/components/heap/test_apps/unity_rom_tests/CMakeLists.txt similarity index 100% rename from components/heap/test_apps/CMakeLists.txt rename to components/heap/test_apps/unity_rom_tests/CMakeLists.txt diff --git a/components/heap/test_apps/README.md b/components/heap/test_apps/unity_rom_tests/README.md similarity index 100% rename from components/heap/test_apps/README.md rename to components/heap/test_apps/unity_rom_tests/README.md diff --git a/components/heap/test_apps/main/CMakeLists.txt b/components/heap/test_apps/unity_rom_tests/main/CMakeLists.txt similarity index 100% rename from components/heap/test_apps/main/CMakeLists.txt rename to components/heap/test_apps/unity_rom_tests/main/CMakeLists.txt diff --git a/components/heap/test_apps/main/test_aligned_alloc_caps.c b/components/heap/test_apps/unity_rom_tests/main/test_aligned_alloc_caps.c similarity index 98% rename from components/heap/test_apps/main/test_aligned_alloc_caps.c rename to components/heap/test_apps/unity_rom_tests/main/test_aligned_alloc_caps.c index 4da12332ef..131363859d 100644 --- a/components/heap/test_apps/main/test_aligned_alloc_caps.c +++ b/components/heap/test_apps/unity_rom_tests/main/test_aligned_alloc_caps.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/heap/test_apps/main/test_allocator_timings.c b/components/heap/test_apps/unity_rom_tests/main/test_allocator_timings.c similarity index 98% rename from components/heap/test_apps/main/test_allocator_timings.c rename to components/heap/test_apps/unity_rom_tests/main/test_allocator_timings.c index 2b291d80ad..1f3ce5b41b 100644 --- a/components/heap/test_apps/main/test_allocator_timings.c +++ b/components/heap/test_apps/unity_rom_tests/main/test_allocator_timings.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/heap/test_apps/main/test_corruption_check.c b/components/heap/test_apps/unity_rom_tests/main/test_corruption_check.c similarity index 97% rename from components/heap/test_apps/main/test_corruption_check.c rename to components/heap/test_apps/unity_rom_tests/main/test_corruption_check.c index d7dc8125ac..9dabeff051 100644 --- a/components/heap/test_apps/main/test_corruption_check.c +++ b/components/heap/test_apps/unity_rom_tests/main/test_corruption_check.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/heap/test_apps/main/test_diram.c b/components/heap/test_apps/unity_rom_tests/main/test_diram.c similarity index 100% rename from components/heap/test_apps/main/test_diram.c rename to components/heap/test_apps/unity_rom_tests/main/test_diram.c diff --git a/components/heap/test_apps/main/test_heap_main.c b/components/heap/test_apps/unity_rom_tests/main/test_heap_main.c similarity index 100% rename from components/heap/test_apps/main/test_heap_main.c rename to components/heap/test_apps/unity_rom_tests/main/test_heap_main.c diff --git a/components/heap/test_apps/main/test_heap_trace.c b/components/heap/test_apps/unity_rom_tests/main/test_heap_trace.c similarity index 100% rename from components/heap/test_apps/main/test_heap_trace.c rename to components/heap/test_apps/unity_rom_tests/main/test_heap_trace.c diff --git a/components/heap/test_apps/main/test_malloc.c b/components/heap/test_apps/unity_rom_tests/main/test_malloc.c similarity index 100% rename from components/heap/test_apps/main/test_malloc.c rename to components/heap/test_apps/unity_rom_tests/main/test_malloc.c diff --git a/components/heap/test_apps/main/test_malloc_caps.c b/components/heap/test_apps/unity_rom_tests/main/test_malloc_caps.c similarity index 100% rename from components/heap/test_apps/main/test_malloc_caps.c rename to components/heap/test_apps/unity_rom_tests/main/test_malloc_caps.c diff --git a/components/heap/test_apps/main/test_realloc.c b/components/heap/test_apps/unity_rom_tests/main/test_realloc.c similarity index 100% rename from components/heap/test_apps/main/test_realloc.c rename to components/heap/test_apps/unity_rom_tests/main/test_realloc.c diff --git a/components/heap/test_apps/main/test_runtime_heap_reg.c b/components/heap/test_apps/unity_rom_tests/main/test_runtime_heap_reg.c similarity index 98% rename from components/heap/test_apps/main/test_runtime_heap_reg.c rename to components/heap/test_apps/unity_rom_tests/main/test_runtime_heap_reg.c index 283b7a082f..5bb726523b 100644 --- a/components/heap/test_apps/main/test_runtime_heap_reg.c +++ b/components/heap/test_apps/unity_rom_tests/main/test_runtime_heap_reg.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/components/heap/test_apps/pytest_heap.py b/components/heap/test_apps/unity_rom_tests/pytest_heap.py similarity index 100% rename from components/heap/test_apps/pytest_heap.py rename to components/heap/test_apps/unity_rom_tests/pytest_heap.py diff --git a/components/heap/test_apps/sdkconfig.ci.8bit_access b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.8bit_access similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.8bit_access rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.8bit_access diff --git a/components/heap/test_apps/sdkconfig.ci.abort_alloc_fail b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.abort_alloc_fail similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.abort_alloc_fail rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.abort_alloc_fail diff --git a/components/heap/test_apps/sdkconfig.ci.comprehensive_poisoning b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.comprehensive_poisoning similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.comprehensive_poisoning rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.comprehensive_poisoning diff --git a/components/heap/test_apps/sdkconfig.ci.func_hooks b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.func_hooks similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.func_hooks rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.func_hooks diff --git a/components/heap/test_apps/sdkconfig.ci.heap_trace b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.heap_trace similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.heap_trace rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.heap_trace diff --git a/components/heap/test_apps/sdkconfig.ci.light_poisoning b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.light_poisoning similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.light_poisoning rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.light_poisoning diff --git a/components/heap/test_apps/sdkconfig.ci.mem_prot b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.mem_prot similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.mem_prot rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.mem_prot diff --git a/components/heap/test_apps/sdkconfig.ci.no_poisoning b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.no_poisoning similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.no_poisoning rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.no_poisoning diff --git a/components/heap/test_apps/sdkconfig.ci.psram b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.psram rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram diff --git a/components/heap/test_apps/sdkconfig.ci.psram_all_ext b/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram_all_ext similarity index 100% rename from components/heap/test_apps/sdkconfig.ci.psram_all_ext rename to components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram_all_ext diff --git a/components/heap/test_apps/sdkconfig.defaults b/components/heap/test_apps/unity_rom_tests/sdkconfig.defaults similarity index 100% rename from components/heap/test_apps/sdkconfig.defaults rename to components/heap/test_apps/unity_rom_tests/sdkconfig.defaults