diff --git a/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py b/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py index 09667bc95b..6bc3b838d6 100644 --- a/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py +++ b/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py @@ -20,9 +20,7 @@ from pytest_embedded import Dut indirect=True, ) def test_legacy_adc(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=240) + dut.run_all_single_board_cases() @pytest.mark.esp32c2 @@ -36,6 +34,4 @@ def test_legacy_adc(dut: Dut) -> None: indirect=True, ) def test_legacy_adc_esp32c2_xtal_26mhz(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=240) + dut.run_all_single_board_cases() diff --git a/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py b/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py index a5a72ebff6..1c5bb88834 100644 --- a/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py +++ b/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py @@ -18,6 +18,4 @@ from pytest_embedded import Dut indirect=True, ) def test_legacy_mcpwm(dut: Dut) -> None: - dut.expect('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output() + dut.run_all_single_board_cases() diff --git a/components/driver/test_apps/legacy_pcnt_driver/pytest_legacy_pcnt.py b/components/driver/test_apps/legacy_pcnt_driver/pytest_legacy_pcnt.py index c8a3555864..8f9938918a 100644 --- a/components/driver/test_apps/legacy_pcnt_driver/pytest_legacy_pcnt.py +++ b/components/driver/test_apps/legacy_pcnt_driver/pytest_legacy_pcnt.py @@ -19,6 +19,4 @@ from pytest_embedded import Dut indirect=True, ) def test_legacy_pcnt(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=240) + dut.run_all_single_board_cases(timeout=240) diff --git a/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py b/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py index 56e2d9d68a..fc3e2d4d56 100644 --- a/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py +++ b/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py @@ -16,6 +16,4 @@ from pytest_embedded import Dut 'release', ], indirect=True) def test_legacy_rmt(dut: Dut) -> None: - dut.expect('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) diff --git a/components/driver/test_apps/legacy_timer_driver/pytest_legacy_timer_driver.py b/components/driver/test_apps/legacy_timer_driver/pytest_legacy_timer_driver.py index 93ae72d934..a3bf1518d9 100644 --- a/components/driver/test_apps/legacy_timer_driver/pytest_legacy_timer_driver.py +++ b/components/driver/test_apps/legacy_timer_driver/pytest_legacy_timer_driver.py @@ -11,6 +11,4 @@ from pytest_embedded import Dut 'release', ], indirect=True) def test_legacy_timer_driver(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) diff --git a/components/driver/test_apps/mcpwm/pytest_mcpwm.py b/components/driver/test_apps/mcpwm/pytest_mcpwm.py index e658c90ba1..356a23922c 100644 --- a/components/driver/test_apps/mcpwm/pytest_mcpwm.py +++ b/components/driver/test_apps/mcpwm/pytest_mcpwm.py @@ -19,6 +19,4 @@ from pytest_embedded import Dut indirect=True, ) def test_mcpwm(dut: Dut) -> None: - dut.expect('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output() + dut.run_all_single_board_cases() diff --git a/components/driver/test_apps/rmt/pytest_rmt.py b/components/driver/test_apps/rmt/pytest_rmt.py index 2170d5c9da..1bbb3bace0 100644 --- a/components/driver/test_apps/rmt/pytest_rmt.py +++ b/components/driver/test_apps/rmt/pytest_rmt.py @@ -21,6 +21,4 @@ from pytest_embedded import Dut indirect=True, ) def test_rmt(dut: Dut) -> None: - dut.expect('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output() + dut.run_all_single_board_cases() diff --git a/components/driver/test_apps/touch_sensor_v1/pytest_touch_sensor_v1.py b/components/driver/test_apps/touch_sensor_v1/pytest_touch_sensor_v1.py index 5d1c07e26c..368fa6cca2 100644 --- a/components/driver/test_apps/touch_sensor_v1/pytest_touch_sensor_v1.py +++ b/components/driver/test_apps/touch_sensor_v1/pytest_touch_sensor_v1.py @@ -1,4 +1,4 @@ -# 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 import pytest from pytest_embedded import Dut @@ -14,6 +14,4 @@ from pytest_embedded import Dut indirect=True, ) def test_touch_sensor_v1(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=60) + dut.run_all_single_board_cases(timeout=60) diff --git a/components/driver/test_apps/touch_sensor_v2/pytest_touch_sensor_v2.py b/components/driver/test_apps/touch_sensor_v2/pytest_touch_sensor_v2.py index 18abe96fa7..3f03441018 100644 --- a/components/driver/test_apps/touch_sensor_v2/pytest_touch_sensor_v2.py +++ b/components/driver/test_apps/touch_sensor_v2/pytest_touch_sensor_v2.py @@ -1,4 +1,4 @@ -# 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 import pytest from pytest_embedded import Dut @@ -15,6 +15,4 @@ from pytest_embedded import Dut indirect=True, ) def test_touch_sensor_v2(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) diff --git a/components/driver/test_apps/twai/pytest_twai.py b/components/driver/test_apps/twai/pytest_twai.py index 85c0479857..454511f2a6 100644 --- a/components/driver/test_apps/twai/pytest_twai.py +++ b/components/driver/test_apps/twai/pytest_twai.py @@ -24,9 +24,7 @@ from pytest_embedded import Dut indirect=True, ) def test_twai_self(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('[twai-loop-back]') - dut.expect_unity_test_output() + dut.run_all_single_board_cases(group='twai-loop-back') @pytest.fixture(name='socket_can', scope='module') diff --git a/components/esp_adc/test_apps/adc/pytest_adc.py b/components/esp_adc/test_apps/adc/pytest_adc.py index a5903c4851..17cd79c432 100644 --- a/components/esp_adc/test_apps/adc/pytest_adc.py +++ b/components/esp_adc/test_apps/adc/pytest_adc.py @@ -18,9 +18,7 @@ from pytest_embedded import Dut 'pm_enable' ], indirect=True) def test_adc(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) # No PM test, as C2 doesn't support ADC continuous mode @@ -36,6 +34,4 @@ def test_adc(dut: Dut) -> None: indirect=True, ) def test_adc_esp32c2_xtal_26mhz(dut: Dut) -> None: - dut.expect_exact('Press ENTER to see the list of tests') - dut.write('*') - dut.expect_unity_test_output(timeout=120) + dut.run_all_single_board_cases(timeout=120) diff --git a/components/esp_hw_support/test_apps/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 index 1f8570d3c4..27c1688489 100644 --- a/components/esp_hw_support/test_apps/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,4 +7,6 @@ from pytest_embedded import Dut @pytest.mark.linux @pytest.mark.host_test def test_esp_hw_support_linux(dut: Dut) -> None: - dut.run_all_single_board_cases() + dut.expect_exact('Press ENTER to see the list of tests') + dut.write('![ignore]') + dut.expect_unity_test_output(timeout=120) diff --git a/components/esp_rom/.build-test-rules.yml b/components/esp_rom/.build-test-rules.yml index ebf8b3ecdb..8a19709b18 100644 --- a/components/esp_rom/.build-test-rules.yml +++ b/components/esp_rom/.build-test-rules.yml @@ -1,6 +1,12 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/esp_rom/test_apps/linux_rom_apis: +components/esp_rom/host_test/rom_test: 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/test_apps/rom_unity_tests/CMakeLists.txt b/components/esp_rom/test_apps/rom_tests/CMakeLists.txt similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/CMakeLists.txt rename to components/esp_rom/test_apps/rom_tests/CMakeLists.txt diff --git a/components/esp_rom/test_apps/rom_unity_tests/README.md b/components/esp_rom/test_apps/rom_tests/README.md similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/README.md rename to components/esp_rom/test_apps/rom_tests/README.md diff --git a/components/esp_rom/test_apps/rom_unity_tests/main/CMakeLists.txt b/components/esp_rom/test_apps/rom_tests/main/CMakeLists.txt similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/main/CMakeLists.txt rename to components/esp_rom/test_apps/rom_tests/main/CMakeLists.txt diff --git a/components/esp_rom/test_apps/rom_unity_tests/main/test_app_main.c b/components/esp_rom/test_apps/rom_tests/main/test_app_main.c similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/main/test_app_main.c rename to components/esp_rom/test_apps/rom_tests/main/test_app_main.c diff --git a/components/esp_rom/test_apps/rom_unity_tests/main/test_libgcc.c b/components/esp_rom/test_apps/rom_tests/main/test_libgcc.c similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/main/test_libgcc.c rename to components/esp_rom/test_apps/rom_tests/main/test_libgcc.c diff --git a/components/esp_rom/test_apps/rom_unity_tests/main/test_miniz.c b/components/esp_rom/test_apps/rom_tests/main/test_miniz.c similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/main/test_miniz.c rename to components/esp_rom/test_apps/rom_tests/main/test_miniz.c diff --git a/components/esp_rom/test_apps/rom_unity_tests/pytest_esp_rom.py b/components/esp_rom/test_apps/rom_tests/pytest_esp_rom.py similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/pytest_esp_rom.py rename to components/esp_rom/test_apps/rom_tests/pytest_esp_rom.py diff --git a/components/esp_rom/test_apps/rom_unity_tests/sdkconfig.defaults b/components/esp_rom/test_apps/rom_tests/sdkconfig.defaults similarity index 100% rename from components/esp_rom/test_apps/rom_unity_tests/sdkconfig.defaults rename to components/esp_rom/test_apps/rom_tests/sdkconfig.defaults diff --git a/components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py b/components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py index 2fec00e91a..7b065ec65e 100644 --- a/components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py +++ b/components/esp_system/test_apps/linux_apis/pytest_esp_system_linux.py @@ -7,4 +7,6 @@ from pytest_embedded import Dut @pytest.mark.linux @pytest.mark.host_test def test_esp_system_linux(dut: Dut) -> None: - dut.run_all_single_board_cases() + dut.expect_exact('Press ENTER to see the list of tests.') + dut.write('*') + dut.expect_unity_test_output(timeout=10) diff --git a/components/heap/test_apps/unity_rom_tests/CMakeLists.txt b/components/heap/test_apps/heap_tests/CMakeLists.txt similarity index 100% rename from components/heap/test_apps/unity_rom_tests/CMakeLists.txt rename to components/heap/test_apps/heap_tests/CMakeLists.txt diff --git a/components/heap/test_apps/unity_rom_tests/README.md b/components/heap/test_apps/heap_tests/README.md similarity index 100% rename from components/heap/test_apps/unity_rom_tests/README.md rename to components/heap/test_apps/heap_tests/README.md diff --git a/components/heap/test_apps/unity_rom_tests/main/CMakeLists.txt b/components/heap/test_apps/heap_tests/main/CMakeLists.txt similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/CMakeLists.txt rename to components/heap/test_apps/heap_tests/main/CMakeLists.txt diff --git a/components/heap/test_apps/unity_rom_tests/main/test_aligned_alloc_caps.c b/components/heap/test_apps/heap_tests/main/test_aligned_alloc_caps.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_aligned_alloc_caps.c rename to components/heap/test_apps/heap_tests/main/test_aligned_alloc_caps.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_allocator_timings.c b/components/heap/test_apps/heap_tests/main/test_allocator_timings.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_allocator_timings.c rename to components/heap/test_apps/heap_tests/main/test_allocator_timings.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_corruption_check.c b/components/heap/test_apps/heap_tests/main/test_corruption_check.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_corruption_check.c rename to components/heap/test_apps/heap_tests/main/test_corruption_check.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_diram.c b/components/heap/test_apps/heap_tests/main/test_diram.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_diram.c rename to components/heap/test_apps/heap_tests/main/test_diram.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_heap_main.c b/components/heap/test_apps/heap_tests/main/test_heap_main.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_heap_main.c rename to components/heap/test_apps/heap_tests/main/test_heap_main.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_heap_trace.c b/components/heap/test_apps/heap_tests/main/test_heap_trace.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_heap_trace.c rename to components/heap/test_apps/heap_tests/main/test_heap_trace.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_malloc.c b/components/heap/test_apps/heap_tests/main/test_malloc.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_malloc.c rename to components/heap/test_apps/heap_tests/main/test_malloc.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_malloc_caps.c b/components/heap/test_apps/heap_tests/main/test_malloc_caps.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_malloc_caps.c rename to components/heap/test_apps/heap_tests/main/test_malloc_caps.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_realloc.c b/components/heap/test_apps/heap_tests/main/test_realloc.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_realloc.c rename to components/heap/test_apps/heap_tests/main/test_realloc.c diff --git a/components/heap/test_apps/unity_rom_tests/main/test_runtime_heap_reg.c b/components/heap/test_apps/heap_tests/main/test_runtime_heap_reg.c similarity index 100% rename from components/heap/test_apps/unity_rom_tests/main/test_runtime_heap_reg.c rename to components/heap/test_apps/heap_tests/main/test_runtime_heap_reg.c diff --git a/components/heap/test_apps/unity_rom_tests/pytest_heap.py b/components/heap/test_apps/heap_tests/pytest_heap.py similarity index 100% rename from components/heap/test_apps/unity_rom_tests/pytest_heap.py rename to components/heap/test_apps/heap_tests/pytest_heap.py diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.8bit_access b/components/heap/test_apps/heap_tests/sdkconfig.ci.8bit_access similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.8bit_access rename to components/heap/test_apps/heap_tests/sdkconfig.ci.8bit_access diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.abort_alloc_fail b/components/heap/test_apps/heap_tests/sdkconfig.ci.abort_alloc_fail similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.abort_alloc_fail rename to components/heap/test_apps/heap_tests/sdkconfig.ci.abort_alloc_fail diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.comprehensive_poisoning b/components/heap/test_apps/heap_tests/sdkconfig.ci.comprehensive_poisoning similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.comprehensive_poisoning rename to components/heap/test_apps/heap_tests/sdkconfig.ci.comprehensive_poisoning diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.func_hooks b/components/heap/test_apps/heap_tests/sdkconfig.ci.func_hooks similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.func_hooks rename to components/heap/test_apps/heap_tests/sdkconfig.ci.func_hooks diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.heap_trace b/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.heap_trace rename to components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.light_poisoning b/components/heap/test_apps/heap_tests/sdkconfig.ci.light_poisoning similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.light_poisoning rename to components/heap/test_apps/heap_tests/sdkconfig.ci.light_poisoning diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.mem_prot b/components/heap/test_apps/heap_tests/sdkconfig.ci.mem_prot similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.mem_prot rename to components/heap/test_apps/heap_tests/sdkconfig.ci.mem_prot diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.no_poisoning b/components/heap/test_apps/heap_tests/sdkconfig.ci.no_poisoning similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.no_poisoning rename to components/heap/test_apps/heap_tests/sdkconfig.ci.no_poisoning diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram b/components/heap/test_apps/heap_tests/sdkconfig.ci.psram similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram rename to components/heap/test_apps/heap_tests/sdkconfig.ci.psram diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram_all_ext b/components/heap/test_apps/heap_tests/sdkconfig.ci.psram_all_ext similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.ci.psram_all_ext rename to components/heap/test_apps/heap_tests/sdkconfig.ci.psram_all_ext diff --git a/components/heap/test_apps/unity_rom_tests/sdkconfig.defaults b/components/heap/test_apps/heap_tests/sdkconfig.defaults similarity index 100% rename from components/heap/test_apps/unity_rom_tests/sdkconfig.defaults rename to components/heap/test_apps/heap_tests/sdkconfig.defaults diff --git a/components/heap/test_apps/host_test_linux/pytest_heap_linux.py b/components/heap/test_apps/host_test_linux/pytest_heap_linux.py index a4cdd5b875..6ae0bf382f 100644 --- a/components/heap/test_apps/host_test_linux/pytest_heap_linux.py +++ b/components/heap/test_apps/host_test_linux/pytest_heap_linux.py @@ -7,4 +7,6 @@ from pytest_embedded import Dut @pytest.mark.linux @pytest.mark.host_test def test_heap_linux(dut: Dut) -> None: - dut.run_all_single_board_cases() + dut.expect_exact('Press ENTER to see the list of tests.') + dut.write('*') + dut.expect_unity_test_output(timeout=10)