Merge branch 'ci/add_test_for_ecos_wifi_enterprise_v54' into 'release/v5.4'

ci(c2/c3): add major eco version tests(v5.4)

See merge request espressif/esp-idf!37808

components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 import pytest
 from pytest_embedded_idf.unity_tester import CaseTester
@@ -29,3 +29,30 @@ def test_wifi_connect_cases(case_tester: CaseTester) -> None:  # type: ignore
 )
 def test_wifi_connect_cases_esp32c2_xtal26m(case_tester: CaseTester) -> None:
     case_tester.run_all_cases()
+
+
+@pytest.mark.esp32c2eco4
+@pytest.mark.wifi_two_dut
+@pytest.mark.xtal_26mhz
+@pytest.mark.parametrize(
+    'count, config, target, baud',
+    [
+        (2, 'esp32c2eco4_xtal26m', 'esp32c2', '74880'),
+    ],
+    indirect=True,
+)
+def test_wifi_connect_cases_esp32c2eco4_xtal26m(case_tester: CaseTester) -> None:
+    case_tester.run_all_cases()
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.esp32c3eco7
+@pytest.mark.parametrize(
+    'count, config, target',
+    [
+        (2, 'esp32c3eco7', 'esp32c3'),
+    ],
+    indirect=True,
+)
+def test_wifi_connect_cases_esp32c3eco7(case_tester: CaseTester) -> None:
+    case_tester.run_all_cases()

components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y

components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.esp32c3eco7

@@ -0,0 +1,2 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y

components/esp_wifi/test_apps/wifi_function/pytest_wifi_function.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 import pytest
 from pytest_embedded import Dut
@@ -29,3 +29,30 @@ def test_wifi_unit_test(dut: Dut) -> None:
 )
 def test_wifi_unit_test_esp32c2_xtal26m(dut: Dut) -> None:
     dut.run_all_single_board_cases()
+
+
+@pytest.mark.esp32c2eco4
+@pytest.mark.xtal_26mhz
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config, target, baud',
+    [
+        ('esp32c2eco4_xtal26m', 'esp32c2', '74880'),
+    ],
+    indirect=True,
+)
+def test_wifi_unit_test_esp32c2eco4_xtal26m(dut: Dut) -> None:
+    dut.run_all_single_board_cases()
+
+
+@pytest.mark.esp32c3eco7
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config, target',
+    [
+        ('esp32c3eco7','esp32c3')
+    ],
+    indirect=True,
+)
+def test_wifi_unit_test_esp32c3eco7(dut: Dut) -> None:
+    dut.run_all_single_board_cases()

components/esp_wifi/test_apps/wifi_function/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y

components/esp_wifi/test_apps/wifi_function/sdkconfig.ci.esp32c3eco7

@@ -0,0 +1,2 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y

components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import pytest
 from pytest_embedded import Dut
@@ -31,3 +31,43 @@ def test_wpa_supplicant_ut_offchan(case_tester: CaseTester) -> None:
     for case in case_tester.test_menu:
         if case.attributes.get('test_env') == 'wifi_two_dut':
             case_tester.run_multi_dev_case(case=case, reset=True)
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.esp32c2eco4
+@pytest.mark.xtal_26mhz
+@pytest.mark.parametrize(
+    'count, config, target, baud',
+    [
+        (
+            2,
+            'esp32c2eco4_xtal26m',
+            'esp32c2',
+            '74880',
+        ),
+    ],
+    indirect=True,
+)
+def test_wpa_supplicant_esp32c2eco4_xtal26mhz(case_tester: CaseTester) -> None:
+    for case in case_tester.test_menu:
+        if case.attributes.get('test_env') == 'wifi_two_dut':
+            case_tester.run_multi_dev_case(case=case, reset=True)
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.esp32c3eco7
+@pytest.mark.parametrize(
+    'count, config, target',
+    [
+        (
+            2,
+            'esp32c3eco7',
+            'esp32c3',
+        ),
+    ],
+    indirect=True,
+)
+def test_wpa_supplicant_esp32c3eco7(case_tester: CaseTester) -> None:
+    for case in case_tester.test_menu:
+        if case.attributes.get('test_env') == 'wifi_two_dut':
+            case_tester.run_multi_dev_case(case=case, reset=True)

components/wpa_supplicant/test_apps/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y

components/wpa_supplicant/test_apps/sdkconfig.ci.esp32c3eco7

@@ -0,0 +1,2 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y

components/wpa_supplicant/test_apps/sdkconfig.defaults

@@ -2,4 +2,4 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
 CONFIG_ESP_WIFI_TESTING_OPTIONS=y
 CONFIG_ESP_WIFI_DPP_SUPPORT=y
-CONFIG_WPA3_SAE=y
+CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y

examples/bluetooth/nimble/blecent/sdkconfig.ci.esp32c2_xtal26m

@@ -1,4 +1,5 @@
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
+
 CONFIG_EXAMPLE_USE_CI_ADDRESS=y
 CONFIG_EXAMPLE_PEER_ADDR="${CI_PIPELINE_ID}"

examples/bluetooth/nimble/blecent/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,6 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y
+
+CONFIG_EXAMPLE_USE_CI_ADDRESS=y
+CONFIG_EXAMPLE_PEER_ADDR="${CI_PIPELINE_ID}"

examples/bluetooth/nimble/blecent/sdkconfig.ci.esp32c3eco7

@@ -0,0 +1,12 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y
+
+#
+# BT config
+#
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y

examples/bluetooth/nimble/power_save/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,7 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y
+
+
+CONFIG_EXAMPLE_USE_CI_ADDRESS=y
+CONFIG_EXAMPLE_CI_ADDRESS_OFFSET="${CI_PIPELINE_ID}"

examples/bluetooth/nimble/power_save/sdkconfig.ci.esp32c3eco7

@@ -0,0 +1,14 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y
+
+
+# MODEM SLEEP Options
+CONFIG_BT_CTRL_MODEM_SLEEP=y
+CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
+# Bluetooth low power clock
+CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y
+# Power up main XTAL during light sleep
+CONFIG_BT_CTRL_MAIN_XTAL_PU_DURING_LIGHT_SLEEP=y
+
+# Enable power down of MAC and baseband in light sleep mode
+CONFIG_ESP_PHY_MAC_BB_PD=y

examples/bluetooth/nimble/pytest_nimble_test.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import os.path
 from typing import Tuple
@@ -62,3 +62,63 @@ def test_power_save_conn_esp32c2_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None:
     peripheral.expect('connection established; status=0', timeout=30)
     output = peripheral.expect(pexpect.TIMEOUT, timeout=30)
     assert 'rst:' not in str(output) and 'boot:' not in str(output)
+
+
+# Case 2: BLE power save test for ESP32C2ECO4
+@pytest.mark.wifi_two_dut
+@pytest.mark.xtal_26mhz
+@pytest.mark.esp32c2eco4
+@pytest.mark.parametrize(
+    'config, count, target, app_path, baud',
+    [
+        (
+            'esp32c2eco4_xtal26m',
+            2,
+            'esp32c2',
+            f'{os.path.join(os.path.dirname(__file__), "power_save")}|{os.path.join(os.path.dirname(__file__), "blecent")}',
+            '74880',
+        ),
+    ],
+    indirect=True,
+)
+def test_power_save_conn_esp32c2eco4(dut: Tuple[IdfDut, IdfDut]) -> None:
+    peripheral = dut[0]
+    central = dut[1]
+
+    peripheral.expect('NimBLE_BLE_PRPH: BLE Host Task Started', timeout=5)
+    central.expect('NimBLE_BLE_CENT: BLE Host Task Started', timeout=5)
+    peripheral.expect('Returned from app_main()', timeout=5)
+    central.expect('Returned from app_main()', timeout=5)
+    central.expect('Connection established', timeout=30)
+    peripheral.expect('connection established; status=0', timeout=30)
+    output = peripheral.expect(pexpect.TIMEOUT, timeout=30)
+    assert 'rst:' not in str(output) and 'boot:' not in str(output)
+
+
+# Case 2: BLE power save test for ESP32C3ECO7
+@pytest.mark.wifi_two_dut
+@pytest.mark.esp32c3eco7
+@pytest.mark.parametrize(
+    'config, count, target, app_path',
+    [
+        (
+            'esp32c3eco7',
+            2,
+            'esp32c3',
+            f'{os.path.join(os.path.dirname(__file__), "power_save")}|{os.path.join(os.path.dirname(__file__), "blecent")}',
+        ),
+    ],
+    indirect=True,
+)
+def test_power_save_conn_esp32c3eco7(dut: Tuple[IdfDut, IdfDut]) -> None:
+    peripheral = dut[0]
+    central = dut[1]
+
+    peripheral.expect('NimBLE_BLE_PRPH: BLE Host Task Started', timeout=5)
+    central.expect('NimBLE_BLE_CENT: BLE Host Task Started', timeout=5)
+    peripheral.expect('Returned from app_main()', timeout=5)
+    central.expect('Returned from app_main()', timeout=5)
+    central.expect('Connection established', timeout=30)
+    peripheral.expect('connection established; status=0', timeout=30)
+    output = peripheral.expect(pexpect.TIMEOUT, timeout=30)
+    assert 'rst:' not in str(output) and 'boot:' not in str(output)

examples/wifi/getting_started/pytest_wifi_getting_started.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import os.path
 from typing import Tuple
@@ -72,3 +72,65 @@ def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) ->
     station.expect(f'{tag}: got ip:', timeout=60)
     station.expect(f'{tag}: connected to ap SSID:{ssid} password:{password}', timeout=60)
     softap.expect('station .+ join, AID=', timeout=60)
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.xtal_26mhz
+@pytest.mark.esp32c2eco4
+@pytest.mark.parametrize(
+    'count, config, target, baud, app_path',
+    [
+        (
+            2,
+            'esp32c2eco4_xtal26m',
+            'esp32c2',
+            '74880',
+            f'{os.path.join(os.path.dirname(__file__), "softAP")}|{os.path.join(os.path.dirname(__file__), "station")}',
+        ),
+    ],
+    indirect=True,
+)
+def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None:
+    softap = dut[0]
+    station = dut[1]
+
+    assert station.app.sdkconfig['ESP_WIFI_SOFTAP_SUPPORT'] is False
+    ssid = softap.app.sdkconfig.get('ESP_WIFI_SSID')
+    password = softap.app.sdkconfig.get('ESP_WIFI_PASSWORD')
+    assert station.app.sdkconfig.get('ESP_WIFI_SSID') == ssid
+    assert station.app.sdkconfig.get('ESP_WIFI_PASSWORD') == password
+
+    tag = 'wifi station'
+    station.expect(f'{tag}: got ip:', timeout=60)
+    station.expect(f'{tag}: connected to ap SSID:{ssid} password:{password}', timeout=60)
+    softap.expect('station .+ join, AID=', timeout=60)
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.esp32c3eco7
+@pytest.mark.parametrize(
+    'count, config, target, app_path',
+    [
+        (
+            2,
+            'esp32c3eco7',
+            'esp32c3',
+            f'{os.path.join(os.path.dirname(__file__), "softAP")}|{os.path.join(os.path.dirname(__file__), "station")}',
+        ),
+    ],
+    indirect=True,
+)
+def test_wifi_getting_started_esp32c3eco7(dut: Tuple[IdfDut, IdfDut]) -> None:
+    softap = dut[0]
+    station = dut[1]
+
+    assert station.app.sdkconfig['ESP_WIFI_SOFTAP_SUPPORT'] is False
+    ssid = softap.app.sdkconfig.get('ESP_WIFI_SSID')
+    password = softap.app.sdkconfig.get('ESP_WIFI_PASSWORD')
+    assert station.app.sdkconfig.get('ESP_WIFI_SSID') == ssid
+    assert station.app.sdkconfig.get('ESP_WIFI_PASSWORD') == password
+
+    tag = 'wifi station'
+    station.expect(f'{tag}: got ip:', timeout=60)
+    station.expect(f'{tag}: connected to ap SSID:{ssid} password:{password}', timeout=60)
+    softap.expect('station .+ join, AID=', timeout=60)

examples/wifi/getting_started/softAP/sdkconfig.ci.c3eco7

@@ -0,0 +1,2 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y

examples/wifi/getting_started/softAP/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y

examples/wifi/getting_started/station/sdkconfig.ci.c3eco7

@@ -0,0 +1,2 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y

examples/wifi/getting_started/station/sdkconfig.ci.esp32c2eco4_xtal26m

@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP32C2_REV_MIN_200=y

examples/wifi/power_save/pytest_wifi_power_save.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 import logging
 
@@ -76,3 +76,30 @@ def test_wifi_power_save_pd_top(dut: Dut) -> None:
 )
 def test_wifi_power_save_esp32c2_26mhz(dut: Dut) -> None:
     _run_test(dut)
+
+
+@pytest.mark.wifi_ap
+@pytest.mark.xtal_26mhz
+@pytest.mark.esp32c2eco4
+@pytest.mark.parametrize(
+    'config, baud, target',
+    [
+        ('c2eco4_xtal26m', '74880', 'esp32c2'),
+    ],
+    indirect=True,
+)
+def test_wifi_power_save_esp32c2eco4_26mhz(dut: Dut) -> None:
+    _run_test(dut)
+
+
+@pytest.mark.wifi_ap
+@pytest.mark.esp32c3eco7
+@pytest.mark.parametrize(
+    'config, target',
+    [
+        ('c3eco7','esp32c3')
+    ],
+    indirect=True,
+)
+def test_wifi_power_save_esp32c3eco7(dut: Dut) -> None:
+    _run_test(dut)

examples/wifi/power_save/sdkconfig.ci.c2eco4_xtal26m

@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
+CONFIG_ESP32C2_REV_MIN_200=y

examples/wifi/power_save/sdkconfig.ci.c3eco7

@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_ESP32C3_REV_MIN_101=y
+CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y

tools/ci/idf_pytest/constants.py

@@ -124,6 +124,8 @@ ENV_MARKERS = {
     'twai_std': 'twai runner with all twai supported targets connect to usb-can adapter',
     'lp_i2s': 'lp_i2s runner tested with hp_i2s',
     'ram_app': 'ram_app runners',
+    'esp32c3eco7': 'esp32c3 major version(v1.1) chips',
+    'esp32c2eco4': 'esp32c2 major version(v2.0) chips',
 }
 
 DEFAULT_CONFIG_RULES_STR = ['sdkconfig.ci=default', 'sdkconfig.ci.*=', '=default']

tools/test_apps/phy/phy_tsens/pytest_phy_tsens.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 import random
 import string
@@ -190,3 +190,54 @@ def test_phy_tsens_coexist_c2_xtal26m(dut: Tuple[Dut, Dut]) -> None:
         _dut.expect('boot:')
         _dut.expect('esp>')
     run_phy_tsens_test_with_light_sleep(dut)
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.xtal_26mhz
+@pytest.mark.esp32c2eco4
+@pytest.mark.parametrize(
+    'count, config, target, baud',
+    [
+        (2, 'c2_eco4', 'esp32c2', '74880'),
+    ],
+    indirect=True,
+)
+def test_phy_tsens_coexist_c2eco4_xtal26m(dut: Tuple[Dut, Dut]) -> None:
+    for _dut in dut:
+        _dut.expect('esp>')
+    run_phy_tsens_test(dut)
+    for _dut in dut:
+        _dut.write('restart')
+        _dut.expect('boot:')
+        _dut.expect('esp>')
+    run_phy_tsens_test_init_wifi_first(dut)
+    for _dut in dut:
+        _dut.write('restart')
+        _dut.expect('boot:')
+        _dut.expect('esp>')
+    run_phy_tsens_test_with_light_sleep(dut)
+
+
+@pytest.mark.wifi_two_dut
+@pytest.mark.esp32c3eco7
+@pytest.mark.parametrize(
+    'count, config, target',
+    [
+        (2, 'c3_eco7', 'esp32c3'),
+    ],
+    indirect=True,
+)
+def test_phy_tsens_coexist_c3eco7(dut: Tuple[Dut, Dut]) -> None:
+    for _dut in dut:
+        _dut.expect('esp>')
+    run_phy_tsens_test(dut)
+    for _dut in dut:
+        _dut.write('restart')
+        _dut.expect('boot:')
+        _dut.expect('esp>')
+    run_phy_tsens_test_init_wifi_first(dut)
+    for _dut in dut:
+        _dut.write('restart')
+        _dut.expect('boot:')
+        _dut.expect('esp>')
+    run_phy_tsens_test_with_light_sleep(dut)

tools/test_apps/phy/phy_tsens/sdkconfig.ci.c2_eco4

@@ -1,2 +1,3 @@
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_ESP32C2_REV_MIN_200=y
+CONFIG_XTAL_FREQ_26=y